diff --git a/src-generated/edu/nps/moves/dis7/enumerations/APAParameterIndexAPAStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/APAParameterIndexAPAStatus.java
index b2de946316f2c4275d857803e7ef6e3739ba9bce..fc4127300b520c83344a4095542c6b6eed169d32 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/APAParameterIndexAPAStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/APAParameterIndexAPAStatus.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 281,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 281 marshal size 2<br>
  * APAParameterIndexAPAStatus
  */
 public enum APAParameterIndexAPAStatus 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Deselected/Off */
-// autogenerated using string template disenumpart2.txt
-
     DESELECTED_OFF (0, "Deselected/Off"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** APA Value Change Only */
-// autogenerated using string template disenumpart2.txt
-
     APA_VALUE_CHANGE_ONLY (1, "APA Value Change Only"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** State Change */
-// autogenerated using string template disenumpart2.txt
-
     STATE_CHANGE (2, "State Change"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Record Activation */
-// autogenerated using string template disenumpart2.txt
-
-    RECORD_ACTIVATION (3, "Record Activation"),;
-
-// autogenerated using string template disenumpart25.txt
+    RECORD_ACTIVATION (3, "Record Activation");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum APAParameterIndexAPAStatus
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java b/src-generated/edu/nps/moves/dis7/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java
index 281eefee21645ea4895435421e364432ab0da0f6..876f6e66c4c0fb045225b366dd07f7b3f2207f76 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java
@@ -7,55 +7,27 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 133, marshal size 8,
- * AddSpecificDimensionEnumerationsforSubsurfaceAreaSize
+ * Generated from XML, <br>
+ * UID 133 marshal size 8<br>
+ * AddSpecificDimensionEnumerationsforSubsurfaceAreaSize<br>
  * The gaps in enumeration values are intentional and are reserved for future additions.
  */
 public enum AddSpecificDimensionEnumerationsforSubsurfaceAreaSize 
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Small School (.5km long x 250m wide x 83m deep - 1km x .5km x 166m) */
-// autogenerated using string template disenumpart2.txt
-
     SMALL_SCHOOL_5KM_LONG_X_250M_WIDE_X_83M_DEEP_1KM_X_5KM_X_166M (222, "Small School (.5km long x 250m wide x 83m deep - 1km x .5km x 166m)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Small School, Dense (.5km long x 250m wide x 83m deep - 1km x .5km x 166m) */
-// autogenerated using string template disenumpart2.txt
-
     SMALL_SCHOOL_DENSE_5KM_LONG_X_250M_WIDE_X_83M_DEEP_1KM_X_5KM_X_166M (223, "Small School, Dense (.5km long x 250m wide x 83m deep - 1km x .5km x 166m)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium School (.5km x 1km x 125m - 1km x 2km x 500m) */
-// autogenerated using string template disenumpart2.txt
-
     MEDIUM_SCHOOL_5KM_X_1KM_X_125M_1KM_X_2KM_X_500M (224, "Medium School (.5km x 1km x 125m - 1km x 2km x 500m)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium School, Dense (.5km x 1km x 125m - 1km x 2km x 500m) */
-// autogenerated using string template disenumpart2.txt
-
     MEDIUM_SCHOOL_DENSE_5KM_X_1KM_X_125M_1KM_X_2KM_X_500M (225, "Medium School, Dense (.5km x 1km x 125m - 1km x 2km x 500m)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Large School (5km x 2km x 500m - 10km x 4km x 1km) */
-// autogenerated using string template disenumpart2.txt
-
     LARGE_SCHOOL_5KM_X_2KM_X_500M_10KM_X_4KM_X_1KM (226, "Large School (5km x 2km x 500m - 10km x 4km x 1km)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Large School, Dense (5km x 2km x 500m - 10km x 4km x 1km) */
-// autogenerated using string template disenumpart2.txt
-
-    LARGE_SCHOOL_DENSE_5KM_X_2KM_X_500M_10KM_X_4KM_X_1KM (227, "Large School, Dense (5km x 2km x 500m - 10km x 4km x 1km)"),;
-
-// autogenerated using string template disenumpart25.txt
+    LARGE_SCHOOL_DENSE_5KM_X_2KM_X_500M_10KM_X_4KM_X_1KM (227, "Large School, Dense (5km x 2km x 500m - 10km x 4km x 1km)");
 
     private int value;
     private final String description;
@@ -105,8 +77,6 @@ public enum AddSpecificDimensionEnumerationsforSubsurfaceAreaSize
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforAirCategory201Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforAirCategory201Insect.java
index b6fb0cd03f63a517a594525f1c0ea55cf271c237..30bdc28d249cb1ace2ff676767c795ec4c83fb92 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforAirCategory201Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforAirCategory201Insect.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 137,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 137 marshal size 8<br>
  * AddVariantsforAirCategory201Insect
  */
 public enum AddVariantsforAirCategory201Insect 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Vertical Shaped Insect Swarm */
-// autogenerated using string template disenumpart2.txt
-
     VERTICAL_SHAPED_INSECT_SWARM (1, "Vertical Shaped Insect Swarm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Circular Shaped Insect Swarm */
-// autogenerated using string template disenumpart2.txt
-
     CIRCULAR_SHAPED_INSECT_SWARM (2, "Circular Shaped Insect Swarm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Irregular Shaped Insect Swarm */
-// autogenerated using string template disenumpart2.txt
-
-    IRREGULAR_SHAPED_INSECT_SWARM (3, "Irregular Shaped Insect Swarm"),;
-
-// autogenerated using string template disenumpart25.txt
+    IRREGULAR_SHAPED_INSECT_SWARM (3, "Irregular Shaped Insect Swarm");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum AddVariantsforAirCategory201Insect
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforLandCategory200Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforLandCategory200Mammal.java
index db39f7e831f3526322efb230befaa8af5a83e41e..aa9259d2a957059f672352de7ae5f340e36165e7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforLandCategory200Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforLandCategory200Mammal.java
@@ -7,54 +7,25 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 134,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 134 marshal size 8<br>
  * AddVariantsforLandCategory200Mammal
  */
 public enum AddVariantsforLandCategory200Mammal 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Animal with a Male Child Rider */
-// autogenerated using string template disenumpart2.txt
-
     ANIMAL_WITH_A_MALE_CHILD_RIDER (1, "Animal with a Male Child Rider"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Animal with a Female Child Rider */
-// autogenerated using string template disenumpart2.txt
-
     ANIMAL_WITH_A_FEMALE_CHILD_RIDER (2, "Animal with a Female Child Rider"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Animal with an Adult Male Rider */
-// autogenerated using string template disenumpart2.txt
-
     ANIMAL_WITH_AN_ADULT_MALE_RIDER (3, "Animal with an Adult Male Rider"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Animal with an Adult Female Rider */
-// autogenerated using string template disenumpart2.txt
-
     ANIMAL_WITH_AN_ADULT_FEMALE_RIDER (4, "Animal with an Adult Female Rider"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Animal Harnessed to a Plow */
-// autogenerated using string template disenumpart2.txt
-
     ANIMAL_HARNESSED_TO_A_PLOW (5, "Animal Harnessed to a Plow"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Animal Harnessed to a Cart */
-// autogenerated using string template disenumpart2.txt
-
-    ANIMAL_HARNESSED_TO_A_CART (6, "Animal Harnessed to a Cart"),;
-
-// autogenerated using string template disenumpart25.txt
+    ANIMAL_HARNESSED_TO_A_CART (6, "Animal Harnessed to a Cart");
 
     private int value;
     private final String description;
@@ -104,8 +75,6 @@ public enum AddVariantsforLandCategory200Mammal
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java
index c566cfd3134c271699619d3c91281ae17a37133e..87c88a219330ac19d58a56e5610e76728307faa1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java
@@ -7,66 +7,29 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 138,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 138 marshal size 8<br>
  * AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect
  */
 public enum AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Black */
-// autogenerated using string template disenumpart2.txt
-
     BLACK (1, "Black"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Green */
-// autogenerated using string template disenumpart2.txt
-
     GREEN (2, "Green"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Spotted */
-// autogenerated using string template disenumpart2.txt
-
     SPOTTED (3, "Spotted"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Red */
-// autogenerated using string template disenumpart2.txt
-
     RED (4, "Red"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Brown */
-// autogenerated using string template disenumpart2.txt
-
     BROWN (5, "Brown"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Blue */
-// autogenerated using string template disenumpart2.txt
-
     BLUE (6, "Blue"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Silver */
-// autogenerated using string template disenumpart2.txt
-
     SILVER (7, "Silver"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Grey */
-// autogenerated using string template disenumpart2.txt
-
-    GREY (8, "Grey"),;
-
-// autogenerated using string template disenumpart25.txt
+    GREY (8, "Grey");
 
     private int value;
     private final String description;
@@ -116,8 +79,6 @@ public enum AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateKind.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateKind.java
index bb303d36b242dc2d1fab749394290460b52f48bc..bdf9744ebbadd097efaf17b7e28f5a281a1d4f79 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateKind.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateKind.java
@@ -7,54 +7,25 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 206,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 206 marshal size 8<br>
  * AggregateStateAggregateKind
  */
 public enum AggregateStateAggregateKind 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Military Hierarchy */
-// autogenerated using string template disenumpart2.txt
-
     MILITARY_HIERARCHY (1, "Military Hierarchy"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Common Type */
-// autogenerated using string template disenumpart2.txt
-
     COMMON_TYPE (2, "Common Type"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Common Mission */
-// autogenerated using string template disenumpart2.txt
-
     COMMON_MISSION (3, "Common Mission"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Similar Capabilities */
-// autogenerated using string template disenumpart2.txt
-
     SIMILAR_CAPABILITIES (4, "Similar Capabilities"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Common Location */
-// autogenerated using string template disenumpart2.txt
-
-    COMMON_LOCATION (5, "Common Location"),;
-
-// autogenerated using string template disenumpart25.txt
+    COMMON_LOCATION (5, "Common Location");
 
     private int value;
     private final String description;
@@ -104,8 +75,6 @@ public enum AggregateStateAggregateKind
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateState.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateState.java
index 897471e37661e02efa07fcc6f7d3779d3e045c86..37d9a63518a73a6c2ece0f0aca9e8e1ae7660807 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateState.java
@@ -7,54 +7,25 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 204,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 204 marshal size 8<br>
  * AggregateStateAggregateState
  */
 public enum AggregateStateAggregateState 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Aggregated */
-// autogenerated using string template disenumpart2.txt
-
     AGGREGATED (1, "Aggregated"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Disaggregated */
-// autogenerated using string template disenumpart2.txt
-
     DISAGGREGATED (2, "Disaggregated"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fully disaggregated */
-// autogenerated using string template disenumpart2.txt
-
     FULLY_DISAGGREGATED (3, "Fully disaggregated"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pseudo-disaggregated */
-// autogenerated using string template disenumpart2.txt
-
     PSEUDO_DISAGGREGATED (4, "Pseudo-disaggregated"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Partially-disaggregated */
-// autogenerated using string template disenumpart2.txt
-
-    PARTIALLY_DISAGGREGATED (5, "Partially-disaggregated"),;
-
-// autogenerated using string template disenumpart25.txt
+    PARTIALLY_DISAGGREGATED (5, "Partially-disaggregated");
 
     private int value;
     private final String description;
@@ -104,8 +75,6 @@ public enum AggregateStateAggregateState
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSpecific.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSpecific.java
index 64b26c39492fae83380d5aca7be7427211924788..2cadc4670a7134362861037497be24c141ce99f5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSpecific.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSpecific.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 209,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 209 marshal size 8<br>
  * AggregateStateSpecific
  */
 public enum AggregateStateSpecific 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No headquarters */
-// autogenerated using string template disenumpart2.txt
-
     NO_HEADQUARTERS (0, "No headquarters"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Yes aggregate unit contains a headquarters */
-// autogenerated using string template disenumpart2.txt
-
-    YES_AGGREGATE_UNIT_CONTAINS_A_HEADQUARTERS (1, "Yes aggregate unit contains a headquarters"),;
-
-// autogenerated using string template disenumpart25.txt
+    YES_AGGREGATE_UNIT_CONTAINS_A_HEADQUARTERS (1, "Yes aggregate unit contains a headquarters");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum AggregateStateSpecific
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSubcategory.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSubcategory.java
index fdeb9106766112c6a673a792d8d2045bce36b206..cf12d9be92575dc4159d7b756f95afdb7ff8faa0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSubcategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSubcategory.java
@@ -7,156 +7,59 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 208,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 208 marshal size 8<br>
  * AggregateStateSubcategory
  */
 public enum AggregateStateSubcategory implements SubCategory
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cavalry Troop */
-// autogenerated using string template disenumpart2.txt
-
     CAVALRY_TROOP (1, "Cavalry Troop"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Armor */
-// autogenerated using string template disenumpart2.txt
-
     ARMOR (2, "Armor"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Infantry */
-// autogenerated using string template disenumpart2.txt
-
     INFANTRY (3, "Infantry"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mechanized Infantry */
-// autogenerated using string template disenumpart2.txt
-
     MECHANIZED_INFANTRY (4, "Mechanized Infantry"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cavalry */
-// autogenerated using string template disenumpart2.txt
-
     CAVALRY (5, "Cavalry"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Armored Cavalry */
-// autogenerated using string template disenumpart2.txt
-
     ARMORED_CAVALRY (6, "Armored Cavalry"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Artillery */
-// autogenerated using string template disenumpart2.txt
-
     ARTILLERY (7, "Artillery"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Self-Propelled Artillery */
-// autogenerated using string template disenumpart2.txt
-
     SELF_PROPELLED_ARTILLERY (8, "Self-Propelled Artillery"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Close Air Support */
-// autogenerated using string template disenumpart2.txt
-
     CLOSE_AIR_SUPPORT (9, "Close Air Support"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Engineer */
-// autogenerated using string template disenumpart2.txt
-
     ENGINEER (10, "Engineer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Air Defense Artillery */
-// autogenerated using string template disenumpart2.txt
-
     AIR_DEFENSE_ARTILLERY (11, "Air Defense Artillery"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Anti-Tank */
-// autogenerated using string template disenumpart2.txt
-
     ANTI_TANK (12, "Anti-Tank"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Army Aviation Fixed-wing */
-// autogenerated using string template disenumpart2.txt
-
     ARMY_AVIATION_FIXED_WING (13, "Army Aviation Fixed-wing"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Army Aviation Rotary-wing */
-// autogenerated using string template disenumpart2.txt
-
     ARMY_AVIATION_ROTARY_WING (14, "Army Aviation Rotary-wing"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Army Attack Helicopter */
-// autogenerated using string template disenumpart2.txt
-
     ARMY_ATTACK_HELICOPTER (15, "Army Attack Helicopter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Air Cavalry */
-// autogenerated using string template disenumpart2.txt
-
     AIR_CAVALRY (16, "Air Cavalry"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Armor Heavy Task Force */
-// autogenerated using string template disenumpart2.txt
-
     ARMOR_HEAVY_TASK_FORCE (17, "Armor Heavy Task Force"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Motorized Rifle */
-// autogenerated using string template disenumpart2.txt
-
     MOTORIZED_RIFLE (18, "Motorized Rifle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mechanized Heavy Task Force */
-// autogenerated using string template disenumpart2.txt
-
     MECHANIZED_HEAVY_TASK_FORCE (19, "Mechanized Heavy Task Force"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Command Post */
-// autogenerated using string template disenumpart2.txt
-
     COMMAND_POST (20, "Command Post"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** CEWI */
-// autogenerated using string template disenumpart2.txt
-
     CEWI (21, "CEWI"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tank only */
-// autogenerated using string template disenumpart2.txt
-
-    TANK_ONLY (22, "Tank only"),;
-
-// autogenerated using string template disenumpart25.txt
+    TANK_ONLY (22, "Tank only");
 
     private int value;
     private final String description;
@@ -206,8 +109,6 @@ public enum AggregateStateSubcategory implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AircraftAddressSource.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftAddressSource.java
index 276aa4f621da6c3e0f3f54b0e3810f007a481c0c..52c3238252c6eee9d59890c9b80d81b073213f60 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AircraftAddressSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftAddressSource.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 364,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 364 marshal size 1<br>
  * AircraftAddressSource
  */
 public enum AircraftAddressSource 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mode S Aircraft Address Field Value */
-// autogenerated using string template disenumpart2.txt
-
     MODE_S_AIRCRAFT_ADDRESS_FIELD_VALUE (0, "Mode S Aircraft Address Field Value"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** GICB IFF Data Record Available */
-// autogenerated using string template disenumpart2.txt
-
-    GICB_IFF_DATA_RECORD_AVAILABLE (1, "GICB IFF Data Record Available"),;
-
-// autogenerated using string template disenumpart25.txt
+    GICB_IFF_DATA_RECORD_AVAILABLE (1, "GICB IFF Data Record Available");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum AircraftAddressSource
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AircraftIdentificationType.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftIdentificationType.java
index 1ece5994362f92cc1dece10960dcbd5f98d63d56..562b7044e7f5ca037766108f3ac1dff10c344ad8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AircraftIdentificationType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftIdentificationType.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 357,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 357 marshal size 8<br>
  * AircraftIdentificationType
  */
 public enum AircraftIdentificationType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Flight Number */
-// autogenerated using string template disenumpart2.txt
-
     FLIGHT_NUMBER (1, "Flight Number"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tail Number */
-// autogenerated using string template disenumpart2.txt
-
-    TAIL_NUMBER (2, "Tail Number"),;
-
-// autogenerated using string template disenumpart25.txt
+    TAIL_NUMBER (2, "Tail Number");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum AircraftIdentificationType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AircraftPresentDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftPresentDomain.java
index 83ca1e8ed69f0fbec2ec392151bb29b0bcf34da8..a99b8b7d9a17bb78dd5d8bf3d9f2c089b3e072f0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AircraftPresentDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftPresentDomain.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 356,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 356 marshal size 8<br>
  * AircraftPresentDomain
  */
 public enum AircraftPresentDomain 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Airborne */
-// autogenerated using string template disenumpart2.txt
-
     AIRBORNE (1, "Airborne"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** On Ground/Surface, Surface includes a water platform surface such as a ship deck */
-// autogenerated using string template disenumpart2.txt
-
-    ON_GROUND_SURFACE (2, "On Ground/Surface"),;
-
-// autogenerated using string template disenumpart25.txt
+    ON_GROUND_SURFACE (2, "On Ground/Surface");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum AircraftPresentDomain
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AircraftTypeWake.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftTypeWake.java
index 7f13232028b3e0cb6a67fa8b0fe4b45ae6f7fbf1..37299a274ed2dc9f113619429dedccf6e45de62f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AircraftTypeWake.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftTypeWake.java
@@ -7,24 +7,15 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 368,
- * marshal size 3,
+ * Generated from XML, <br>
+ * UID 368 marshal size 3<br>
  * AircraftTypeWake
  */
 public enum AircraftTypeWake 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
-    NO_STATEMENT (0, "No Statement"),;
-
-// autogenerated using string template disenumpart25.txt
+    NO_STATEMENT (0, "No Statement");
 
     private int value;
     private final String description;
@@ -74,8 +65,6 @@ public enum AircraftTypeWake
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java b/src-generated/edu/nps/moves/dis7/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java
index 336f311a89b0b1482f2c7ce6184a5fe390f0c389..0240ccfc4eb987ec59fcead4f03092689c0adbe6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java
@@ -7,103 +7,43 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 130, marshal size 8,
- * AnimalLifeformGroupSizeRangeEnumerationforallDomains
+ * Generated from XML, <br>
+ * UID 130 marshal size 8<br>
+ * AnimalLifeformGroupSizeRangeEnumerationforallDomains<br>
  * The gaps in enumeration values are intentional and are reserved for future additions.
  */
 public enum AnimalLifeformGroupSizeRangeEnumerationforallDomains 
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Number of animals range from 201 to 249 */
-// autogenerated using string template disenumpart2.txt
-
     NUMBER_OF_ANIMALS_RANGE_FROM_201_TO_249 (201, "Number of animals range from 201 to 249"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Number of animals range from 250 to 299 */
-// autogenerated using string template disenumpart2.txt
-
     NUMBER_OF_ANIMALS_RANGE_FROM_250_TO_299 (202, "Number of animals range from 250 to 299"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Number of animals range from 300 to 399 */
-// autogenerated using string template disenumpart2.txt
-
     NUMBER_OF_ANIMALS_RANGE_FROM_300_TO_399 (203, "Number of animals range from 300 to 399"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Number of animals range from 400 to 499 */
-// autogenerated using string template disenumpart2.txt
-
     NUMBER_OF_ANIMALS_RANGE_FROM_400_TO_499 (204, "Number of animals range from 400 to 499"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Number of animals range from 500 to 999 */
-// autogenerated using string template disenumpart2.txt
-
     NUMBER_OF_ANIMALS_RANGE_FROM_500_TO_999 (205, "Number of animals range from 500 to 999"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Number of animals range from 1,000 to 1,499 */
-// autogenerated using string template disenumpart2.txt
-
     NUMBER_OF_ANIMALS_RANGE_FROM_1_000_TO_1_499 (206, "Number of animals range from 1,000 to 1,499"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Number of animals range from 1,500 to 1,999 */
-// autogenerated using string template disenumpart2.txt
-
     NUMBER_OF_ANIMALS_RANGE_FROM_1_500_TO_1_999 (207, "Number of animals range from 1,500 to 1,999"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Number of animals range from 2,000 to 2,999 */
-// autogenerated using string template disenumpart2.txt
-
     NUMBER_OF_ANIMALS_RANGE_FROM_2_000_TO_2_999 (208, "Number of animals range from 2,000 to 2,999"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Number of animals range from 3,000 to 4,999 */
-// autogenerated using string template disenumpart2.txt
-
     NUMBER_OF_ANIMALS_RANGE_FROM_3_000_TO_4_999 (210, "Number of animals range from 3,000 to 4,999"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Number of animals range from 5,000 to 6,999 */
-// autogenerated using string template disenumpart2.txt
-
     NUMBER_OF_ANIMALS_RANGE_FROM_5_000_TO_6_999 (212, "Number of animals range from 5,000 to 6,999"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Number of animals range from 7,000 to 9,999 */
-// autogenerated using string template disenumpart2.txt
-
     NUMBER_OF_ANIMALS_RANGE_FROM_7_000_TO_9_999 (214, "Number of animals range from 7,000 to 9,999"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Number of animals range from 10,000 to 19,999 */
-// autogenerated using string template disenumpart2.txt
-
     NUMBER_OF_ANIMALS_RANGE_FROM_10_000_TO_19_999 (216, "Number of animals range from 10,000 to 19,999"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Number of animals range from 20,000 to 50,000 */
-// autogenerated using string template disenumpart2.txt
-
     NUMBER_OF_ANIMALS_RANGE_FROM_20_000_TO_50_000 (218, "Number of animals range from 20,000 to 50,000"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Number of animals range greater than 50,000 */
-// autogenerated using string template disenumpart2.txt
-
-    NUMBER_OF_ANIMALS_RANGE_GREATER_THAN_50_000 (220, "Number of animals range greater than 50,000"),;
-
-// autogenerated using string template disenumpart25.txt
+    NUMBER_OF_ANIMALS_RANGE_GREATER_THAN_50_000 (220, "Number of animals range greater than 50,000");
 
     private int value;
     private final String description;
@@ -153,8 +93,6 @@ public enum AnimalLifeformGroupSizeRangeEnumerationforallDomains
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AntennaSelection.java b/src-generated/edu/nps/moves/dis7/enumerations/AntennaSelection.java
index d195c2f21a1db9fe1f31eecff81b3dcef15360f4..a24fa8af29db067dbbc44602da9a6e1526984706 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AntennaSelection.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AntennaSelection.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 351,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 351 marshal size 2<br>
  * AntennaSelection
  */
 public enum AntennaSelection 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Top */
-// autogenerated using string template disenumpart2.txt
-
     TOP (1, "Top"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bottom */
-// autogenerated using string template disenumpart2.txt
-
     BOTTOM (2, "Bottom"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Diversity */
-// autogenerated using string template disenumpart2.txt
-
-    DIVERSITY (3, "Diversity"),;
-
-// autogenerated using string template disenumpart25.txt
+    DIVERSITY (3, "Diversity");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum AntennaSelection
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AntennaStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/AntennaStatus.java
index a5296efe316fe4c22bb145bceeab4fa57ec0ac23..38fedc72cbe0e781754f027c765ab26038d09746 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AntennaStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AntennaStatus.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 371,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 371 marshal size 8<br>
  * AntennaStatus
  */
 public enum AntennaStatus 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Able to Emit */
-// autogenerated using string template disenumpart2.txt
-
     NOT_ABLE_TO_EMIT (1, "Not Able to Emit"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Able to Emit */
-// autogenerated using string template disenumpart2.txt
-
-    ABLE_TO_EMIT (2, "Able to Emit"),;
-
-// autogenerated using string template disenumpart25.txt
+    ABLE_TO_EMIT (2, "Able to Emit");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum AntennaStatus
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceAntiCollisionDayNight.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceAntiCollisionDayNight.java
index ebe7d1d639da177d6d92a6f58350e9fc678d496f..abbb3ba3260dc7613d31cb166ae83c2ccc64bb0e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceAntiCollisionDayNight.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceAntiCollisionDayNight.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 397,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 397 marshal size 1<br>
  * AppearanceAntiCollisionDayNight
  */
 public enum AppearanceAntiCollisionDayNight 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Day */
-// autogenerated using string template disenumpart2.txt
-
     DAY (0, "Day"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Night */
-// autogenerated using string template disenumpart2.txt
-
-    NIGHT (1, "Night"),;
-
-// autogenerated using string template disenumpart25.txt
+    NIGHT (1, "Night");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum AppearanceAntiCollisionDayNight
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCamouflageType.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCamouflageType.java
index 67ec3f4ce50fafcbb161c907c3f13df293a4ead3..57a1631e536731b115340aa4302f3e9cd8a45d28 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCamouflageType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCamouflageType.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 384,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 384 marshal size 2<br>
  * AppearanceCamouflageType
  */
 public enum AppearanceCamouflageType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Desert Camouflage */
-// autogenerated using string template disenumpart2.txt
-
     DESERT_CAMOUFLAGE (0, "Desert Camouflage"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Winter Camouflage */
-// autogenerated using string template disenumpart2.txt
-
     WINTER_CAMOUFLAGE (1, "Winter Camouflage"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Forest Camouflage */
-// autogenerated using string template disenumpart2.txt
-
     FOREST_CAMOUFLAGE (2, "Forest Camouflage"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
-    OTHER (3, "Other"),;
-
-// autogenerated using string template disenumpart25.txt
+    OTHER (3, "Other");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum AppearanceCamouflageType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCanopy.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCanopy.java
index b7ed55b22913ca48cd15223728937fc7b50a147f..a5ca9a3a1fe1c9f557d6486f3ef320959e3f9149 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCanopy.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCanopy.java
@@ -7,60 +7,27 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 387,
- * marshal size 3,
+ * Generated from XML, <br>
+ * UID 387 marshal size 3<br>
  * AppearanceCanopy
  */
 public enum AppearanceCanopy 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Applicable */
-// autogenerated using string template disenumpart2.txt
-
     NOT_APPLICABLE (0, "Not Applicable"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Single Canopy/Single Troop Door Closed */
-// autogenerated using string template disenumpart2.txt
-
     SINGLE_CANOPY_SINGLE_TROOP_DOOR_CLOSED (1, "Single Canopy/Single Troop Door Closed"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Front and Rear Canopy/Left and Right Troop Door Closed */
-// autogenerated using string template disenumpart2.txt
-
     FRONT_AND_REAR_CANOPY_LEFT_AND_RIGHT_TROOP_DOOR_CLOSED (2, "Front and Rear Canopy/Left and Right Troop Door Closed"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Front Canopy/Left Troop Door Open */
-// autogenerated using string template disenumpart2.txt
-
     FRONT_CANOPY_LEFT_TROOP_DOOR_OPEN (3, "Front Canopy/Left Troop Door Open"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Single Canopy/Single Troop Door Open */
-// autogenerated using string template disenumpart2.txt
-
     SINGLE_CANOPY_SINGLE_TROOP_DOOR_OPEN (4, "Single Canopy/Single Troop Door Open"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Rear Canopy/Right Troop Door Open */
-// autogenerated using string template disenumpart2.txt
-
     REAR_CANOPY_RIGHT_TROOP_DOOR_OPEN (5, "Rear Canopy/Right Troop Door Open"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Front and Rear Canopy/Left and Right Troop Door Open */
-// autogenerated using string template disenumpart2.txt
-
-    FRONT_AND_REAR_CANOPY_LEFT_AND_RIGHT_TROOP_DOOR_OPEN (6, "Front and Rear Canopy/Left and Right Troop Door Open"),;
-
-// autogenerated using string template disenumpart25.txt
+    FRONT_AND_REAR_CANOPY_LEFT_AND_RIGHT_TROOP_DOOR_OPEN (6, "Front and Rear Canopy/Left and Right Troop Door Open");
 
     private int value;
     private final String description;
@@ -110,8 +77,6 @@ public enum AppearanceCanopy
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedMovement.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedMovement.java
index f4cf05ab2b5405dc1fc82e6c6a73f1d3fc9025a1..0d7d0cfbde2d40790d29ec7a64d04b2065b648b0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedMovement.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedMovement.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 394,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 394 marshal size 1<br>
  * AppearanceConcealedMovement
  */
 public enum AppearanceConcealedMovement 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Open Movement */
-// autogenerated using string template disenumpart2.txt
-
     OPEN_MOVEMENT (0, "Open Movement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Rushes Between Covered Positions */
-// autogenerated using string template disenumpart2.txt
-
-    RUSHES_BETWEEN_COVERED_POSITIONS (1, "Rushes Between Covered Positions"),;
-
-// autogenerated using string template disenumpart25.txt
+    RUSHES_BETWEEN_COVERED_POSITIONS (1, "Rushes Between Covered Positions");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum AppearanceConcealedMovement
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedPosition.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedPosition.java
index 38c73bbdfa6fb7305231ea885df2851792e5d604..a54d2b30611e2ca6fece9412bcd45e3bee429f5a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedPosition.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedPosition.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 385,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 385 marshal size 1<br>
  * AppearanceConcealedPosition
  */
 public enum AppearanceConcealedPosition 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Concealed */
-// autogenerated using string template disenumpart2.txt
-
     NOT_CONCEALED (0, "Not Concealed"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Prepared Concealed Position */
-// autogenerated using string template disenumpart2.txt
-
-    PREPARED_CONCEALED_POSITION (1, "Prepared Concealed Position"),;
-
-// autogenerated using string template disenumpart25.txt
+    PREPARED_CONCEALED_POSITION (1, "Prepared Concealed Position");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum AppearanceConcealedPosition
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceDamage.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceDamage.java
index 1164976504aa483f3a423fa54ac8d4acbefc5a62..54a7da765e6aba399ad666c7558155fec94e98bc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceDamage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceDamage.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 379,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 379 marshal size 2<br>
  * AppearanceDamage
  */
 public enum AppearanceDamage 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Damage */
-// autogenerated using string template disenumpart2.txt
-
     NO_DAMAGE (0, "No Damage"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Slight Damage */
-// autogenerated using string template disenumpart2.txt
-
     SLIGHT_DAMAGE (1, "Slight Damage"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Moderate Damage */
-// autogenerated using string template disenumpart2.txt
-
     MODERATE_DAMAGE (2, "Moderate Damage"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Destroyed */
-// autogenerated using string template disenumpart2.txt
-
-    DESTROYED (3, "Destroyed"),;
-
-// autogenerated using string template disenumpart25.txt
+    DESTROYED (3, "Destroyed");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum AppearanceDamage
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEntityorObjectState.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEntityorObjectState.java
index aa11efd820f5a3ae5121fbed368a63e1f01335bb..43f03fc6a95a2e5841ca7ab2410ff9c9989d2167 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEntityorObjectState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEntityorObjectState.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 386,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 386 marshal size 1<br>
  * AppearanceEntityorObjectState
  */
 public enum AppearanceEntityorObjectState 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Active */
-// autogenerated using string template disenumpart2.txt
-
     ACTIVE (0, "Active"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Deactivated */
-// autogenerated using string template disenumpart2.txt
-
-    DEACTIVATED (1, "Deactivated"),;
-
-// autogenerated using string template disenumpart25.txt
+    DEACTIVATED (1, "Deactivated");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum AppearanceEntityorObjectState
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEnvironmentalDensity.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEnvironmentalDensity.java
index b3266a4de1366768f8b56b08761274b048bfbeb5..adc7dc0a5a1ba46849657625e8dfa3d6e58f77c9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEnvironmentalDensity.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEnvironmentalDensity.java
@@ -7,48 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 395,
- * marshal size 4,
+ * Generated from XML, <br>
+ * UID 395 marshal size 4<br>
  * AppearanceEnvironmentalDensity
  */
 public enum AppearanceEnvironmentalDensity 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Clear */
-// autogenerated using string template disenumpart2.txt
-
     CLEAR (0, "Clear"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hazy */
-// autogenerated using string template disenumpart2.txt
-
     HAZY (1, "Hazy"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dense */
-// autogenerated using string template disenumpart2.txt
-
     DENSE (2, "Dense"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Very Dense */
-// autogenerated using string template disenumpart2.txt
-
     VERY_DENSE (3, "Very Dense"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Opaque */
-// autogenerated using string template disenumpart2.txt
-
-    OPAQUE (4, "Opaque"),;
-
-// autogenerated using string template disenumpart25.txt
+    OPAQUE (4, "Opaque");
 
     private int value;
     private final String description;
@@ -98,8 +73,6 @@ public enum AppearanceEnvironmentalDensity
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceHatch.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceHatch.java
index 760485e733b1033962c6285132c9e47b58b8aaab..8847f4b864bb184221b73e018bf82c1990dd35b8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceHatch.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceHatch.java
@@ -7,54 +7,25 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 382,
- * marshal size 3,
+ * Generated from XML, <br>
+ * UID 382 marshal size 3<br>
  * AppearanceHatch
  */
 public enum AppearanceHatch 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Applicable */
-// autogenerated using string template disenumpart2.txt
-
     NOT_APPLICABLE (0, "Not Applicable"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Closed */
-// autogenerated using string template disenumpart2.txt
-
     CLOSED (1, "Closed"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Popped */
-// autogenerated using string template disenumpart2.txt
-
     POPPED (2, "Popped"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Popped and Person Is Visible */
-// autogenerated using string template disenumpart2.txt
-
     POPPED_AND_PERSON_IS_VISIBLE (3, "Popped and Person Is Visible"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Open */
-// autogenerated using string template disenumpart2.txt
-
     OPEN (4, "Open"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Open and Person Is Visible */
-// autogenerated using string template disenumpart2.txt
-
-    OPEN_AND_PERSON_IS_VISIBLE (5, "Open and Person Is Visible"),;
-
-// autogenerated using string template disenumpart25.txt
+    OPEN_AND_PERSON_IS_VISIBLE (5, "Open and Person Is Visible");
 
     private int value;
     private final String description;
@@ -104,8 +75,6 @@ public enum AppearanceHatch
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLauncherOperational.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLauncherOperational.java
index 362cfd402e5f82ee9ac2828f21eaedfb0214b774..cf829f594f26c50d1985ccb1e627a338313d2366 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLauncherOperational.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLauncherOperational.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 383,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 383 marshal size 1<br>
  * AppearanceLauncherOperational
  */
 public enum AppearanceLauncherOperational 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Raised/Not Operational */
-// autogenerated using string template disenumpart2.txt
-
     NOT_RAISED_NOT_OPERATIONAL (0, "Not Raised/Not Operational"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Raised/Operational */
-// autogenerated using string template disenumpart2.txt
-
-    RAISED_OPERATIONAL (1, "Raised/Operational"),;
-
-// autogenerated using string template disenumpart25.txt
+    RAISED_OPERATIONAL (1, "Raised/Operational");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum AppearanceLauncherOperational
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormComplianceStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormComplianceStatus.java
index 9d48ca21b5d568d27b29d9b9a6a8d3013df90581..a1dfe012d0a597a14c8a40e8b0af6efa25c8bbb9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormComplianceStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormComplianceStatus.java
@@ -7,114 +7,45 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 391,
- * marshal size 4,
+ * Generated from XML, <br>
+ * UID 391 marshal size 4<br>
  * AppearanceLifeFormComplianceStatus
  */
 public enum AppearanceLifeFormComplianceStatus 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Specified */
-// autogenerated using string template disenumpart2.txt
-
     NOT_SPECIFIED (0, "Not Specified"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Detained */
-// autogenerated using string template disenumpart2.txt
-
     DETAINED (1, "Detained"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Surrender */
-// autogenerated using string template disenumpart2.txt
-
     SURRENDER (2, "Surrender"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Using Fists */
-// autogenerated using string template disenumpart2.txt
-
     USING_FISTS (3, "Using Fists"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Verbal Abuse Level 1 */
-// autogenerated using string template disenumpart2.txt
-
     VERBAL_ABUSE_LEVEL_1 (4, "Verbal Abuse Level 1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Verbal Abuse Level 2 */
-// autogenerated using string template disenumpart2.txt
-
     VERBAL_ABUSE_LEVEL_2 (5, "Verbal Abuse Level 2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Verbal Abuse Level 3 */
-// autogenerated using string template disenumpart2.txt
-
     VERBAL_ABUSE_LEVEL_3 (6, "Verbal Abuse Level 3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Passive Resistance Level 1 */
-// autogenerated using string template disenumpart2.txt
-
     PASSIVE_RESISTANCE_LEVEL_1 (7, "Passive Resistance Level 1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Passive Resistance Level 2 */
-// autogenerated using string template disenumpart2.txt
-
     PASSIVE_RESISTANCE_LEVEL_2 (8, "Passive Resistance Level 2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Passive Resistance Level 3 */
-// autogenerated using string template disenumpart2.txt
-
     PASSIVE_RESISTANCE_LEVEL_3 (9, "Passive Resistance Level 3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Using Non-Lethal Weapon 1 */
-// autogenerated using string template disenumpart2.txt
-
     USING_NON_LETHAL_WEAPON_1 (10, "Using Non-Lethal Weapon 1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Using Non-Lethal Weapon 2 */
-// autogenerated using string template disenumpart2.txt
-
     USING_NON_LETHAL_WEAPON_2 (11, "Using Non-Lethal Weapon 2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Using Non-Lethal Weapon 3 */
-// autogenerated using string template disenumpart2.txt
-
     USING_NON_LETHAL_WEAPON_3 (12, "Using Non-Lethal Weapon 3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Using Non-Lethal Weapon 4 */
-// autogenerated using string template disenumpart2.txt
-
     USING_NON_LETHAL_WEAPON_4 (13, "Using Non-Lethal Weapon 4"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Using Non-Lethal Weapon 5 */
-// autogenerated using string template disenumpart2.txt
-
     USING_NON_LETHAL_WEAPON_5 (14, "Using Non-Lethal Weapon 5"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Using Non-Lethal Weapon 6 */
-// autogenerated using string template disenumpart2.txt
-
-    USING_NON_LETHAL_WEAPON_6 (15, "Using Non-Lethal Weapon 6"),;
-
-// autogenerated using string template disenumpart25.txt
+    USING_NON_LETHAL_WEAPON_6 (15, "Using Non-Lethal Weapon 6");
 
     private int value;
     private final String description;
@@ -164,8 +95,6 @@ public enum AppearanceLifeFormComplianceStatus
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormPosture.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormPosture.java
index 4cc5b234a8f1b0ffad75f236d000ba6f279cef23..bb5b28551f14898484d16d024eaa9c6988972896 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormPosture.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormPosture.java
@@ -7,114 +7,45 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 392,
- * marshal size 4,
+ * Generated from XML, <br>
+ * UID 392 marshal size 4<br>
  * AppearanceLifeFormPosture
  */
 public enum AppearanceLifeFormPosture 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Specified */
-// autogenerated using string template disenumpart2.txt
-
     NOT_SPECIFIED (0, "Not Specified"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Upright, Standing Still */
-// autogenerated using string template disenumpart2.txt
-
     UPRIGHT_STANDING_STILL (1, "Upright, Standing Still"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Upright, Walking */
-// autogenerated using string template disenumpart2.txt
-
     UPRIGHT_WALKING (2, "Upright, Walking"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Upright, Running */
-// autogenerated using string template disenumpart2.txt
-
     UPRIGHT_RUNNING (3, "Upright, Running"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Kneeling */
-// autogenerated using string template disenumpart2.txt
-
     KNEELING (4, "Kneeling"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Prone */
-// autogenerated using string template disenumpart2.txt
-
     PRONE (5, "Prone"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Crawling */
-// autogenerated using string template disenumpart2.txt
-
     CRAWLING (6, "Crawling"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Swimming */
-// autogenerated using string template disenumpart2.txt
-
     SWIMMING (7, "Swimming"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Parachuting */
-// autogenerated using string template disenumpart2.txt
-
     PARACHUTING (8, "Parachuting"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Jumping */
-// autogenerated using string template disenumpart2.txt
-
     JUMPING (9, "Jumping"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sitting */
-// autogenerated using string template disenumpart2.txt
-
     SITTING (10, "Sitting"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Squatting */
-// autogenerated using string template disenumpart2.txt
-
     SQUATTING (11, "Squatting"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Crouching */
-// autogenerated using string template disenumpart2.txt
-
     CROUCHING (12, "Crouching"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Wading */
-// autogenerated using string template disenumpart2.txt
-
     WADING (13, "Wading"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Surrender */
-// autogenerated using string template disenumpart2.txt
-
     SURRENDER (14, "Surrender"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Detained */
-// autogenerated using string template disenumpart2.txt
-
-    DETAINED (15, "Detained"),;
-
-// autogenerated using string template disenumpart25.txt
+    DETAINED (15, "Detained");
 
     private int value;
     private final String description;
@@ -164,8 +95,6 @@ public enum AppearanceLifeFormPosture
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormWeaponImplement.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormWeaponImplement.java
index 152a8b3b43da4f0b7d65cf640494b4e6f419d15c..d5fe7f1141cad05e25d471e2f11bdc4888f18752 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormWeaponImplement.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormWeaponImplement.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 393,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 393 marshal size 2<br>
  * AppearanceLifeFormWeaponImplement
  */
 public enum AppearanceLifeFormWeaponImplement 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Present */
-// autogenerated using string template disenumpart2.txt
-
     NOT_PRESENT (0, "Not Present"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Stowed */
-// autogenerated using string template disenumpart2.txt
-
     STOWED (1, "Stowed"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Deployed/Active */
-// autogenerated using string template disenumpart2.txt
-
     DEPLOYED_ACTIVE (2, "Deployed/Active"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Firing Position/In Use */
-// autogenerated using string template disenumpart2.txt
-
-    FIRING_POSITION_IN_USE (3, "Firing Position/In Use"),;
-
-// autogenerated using string template disenumpart25.txt
+    FIRING_POSITION_IN_USE (3, "Firing Position/In Use");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum AppearanceLifeFormWeaponImplement
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeformHealth.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeformHealth.java
index 5c456a8418385eb31be3e3d0f1c90c0176ec12e6..68586b45567723215b6f8bd039b63b98a53f5c2d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeformHealth.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeformHealth.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 390,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 390 marshal size 2<br>
  * AppearanceLifeformHealth
  */
 public enum AppearanceLifeformHealth 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Injury */
-// autogenerated using string template disenumpart2.txt
-
     NO_INJURY (0, "No Injury"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Slight Injury */
-// autogenerated using string template disenumpart2.txt
-
     SLIGHT_INJURY (1, "Slight Injury"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Moderate Injury */
-// autogenerated using string template disenumpart2.txt
-
     MODERATE_INJURY (2, "Moderate Injury"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fatal Injury */
-// autogenerated using string template disenumpart2.txt
-
-    FATAL_INJURY (3, "Fatal Injury"),;
-
-// autogenerated using string template disenumpart25.txt
+    FATAL_INJURY (3, "Fatal Injury");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum AppearanceLifeformHealth
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectLaneMarkerVisible.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectLaneMarkerVisible.java
index e550a13f115a350a724bd222accdda8551a96580..deceeb82c1b7ddd8a390091f6109e14526b390e6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectLaneMarkerVisible.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectLaneMarkerVisible.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 410,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 410 marshal size 2<br>
  * AppearanceLinearObjectLaneMarkerVisible
  */
 public enum AppearanceLinearObjectLaneMarkerVisible 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Left Side Is Visible */
-// autogenerated using string template disenumpart2.txt
-
     LEFT_SIDE_IS_VISIBLE (0, "Left Side Is Visible"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Right Side Is Visible */
-// autogenerated using string template disenumpart2.txt
-
     RIGHT_SIDE_IS_VISIBLE (1, "Right Side Is Visible"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Both Sides Are Visible */
-// autogenerated using string template disenumpart2.txt
-
-    BOTH_SIDES_ARE_VISIBLE (2, "Both Sides Are Visible"),;
-
-// autogenerated using string template disenumpart25.txt
+    BOTH_SIDES_ARE_VISIBLE (2, "Both Sides Are Visible");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum AppearanceLinearObjectLaneMarkerVisible
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectTankDitchBreach.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectTankDitchBreach.java
index 4635c81db0c428ec7135962819ed9de89fc0ce92..252d9b15915172052589ff6b0d6970f4f208c285 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectTankDitchBreach.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectTankDitchBreach.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 409,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 409 marshal size 2<br>
  * AppearanceLinearObjectTankDitchBreach
  */
 public enum AppearanceLinearObjectTankDitchBreach 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Breaching */
-// autogenerated using string template disenumpart2.txt
-
     NO_BREACHING (0, "No Breaching"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Slight Breaching */
-// autogenerated using string template disenumpart2.txt
-
     SLIGHT_BREACHING (1, "Slight Breaching"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Moderate Breached */
-// autogenerated using string template disenumpart2.txt
-
     MODERATE_BREACHED (2, "Moderate Breached"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cleared */
-// autogenerated using string template disenumpart2.txt
-
-    CLEARED (3, "Cleared"),;
-
-// autogenerated using string template disenumpart25.txt
+    CLEARED (3, "Cleared");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum AppearanceLinearObjectTankDitchBreach
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNVGMode.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNVGMode.java
index dac33c9035882d607a992a76da8bcd50bb163188..eec6fa4bb4f5f749cd5dbf5be7597a54fd5a8c76 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNVGMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNVGMode.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 400,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 400 marshal size 1<br>
  * AppearanceNVGMode
  */
 public enum AppearanceNVGMode 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Overt Lighting */
-// autogenerated using string template disenumpart2.txt
-
     OVERT_LIGHTING (0, "Overt Lighting"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Covert Lighting (Night Vision Goggles) */
-// autogenerated using string template disenumpart2.txt
-
-    COVERT_LIGHTING_NIGHT_VISION_GOGGLES (1, "Covert Lighting (Night Vision Goggles)"),;
-
-// autogenerated using string template disenumpart25.txt
+    COVERT_LIGHTING_NIGHT_VISION_GOGGLES (1, "Covert Lighting (Night Vision Goggles)");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum AppearanceNVGMode
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNavigationPositionBrightness.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNavigationPositionBrightness.java
index 6d6f3cbbb8e3583ef62288755fe427ecf0462d96..647cc3873c7a972b87306e5f83e7f3f07bfa2e89 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNavigationPositionBrightness.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNavigationPositionBrightness.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 398,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 398 marshal size 1<br>
  * AppearanceNavigationPositionBrightness
  */
 public enum AppearanceNavigationPositionBrightness 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dim */
-// autogenerated using string template disenumpart2.txt
-
     DIM (0, "Dim"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bright */
-// autogenerated using string template disenumpart2.txt
-
-    BRIGHT (1, "Bright"),;
-
-// autogenerated using string template disenumpart25.txt
+    BRIGHT (1, "Bright");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum AppearanceNavigationPositionBrightness
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralDamage.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralDamage.java
index 16f41f80a10560b5837823031d5e0f462442dc2a..ea252f2dd19040d433d2fbc533cc56d451c1146d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralDamage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralDamage.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 405,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 405 marshal size 2<br>
  * AppearanceObjectGeneralDamage
  */
 public enum AppearanceObjectGeneralDamage 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Damage */
-// autogenerated using string template disenumpart2.txt
-
     NO_DAMAGE (0, "No Damage"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Damaged */
-// autogenerated using string template disenumpart2.txt
-
     DAMAGED (1, "Damaged"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Destroyed */
-// autogenerated using string template disenumpart2.txt
-
-    DESTROYED (2, "Destroyed"),;
-
-// autogenerated using string template disenumpart25.txt
+    DESTROYED (2, "Destroyed");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum AppearanceObjectGeneralDamage
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralIEDPresent.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralIEDPresent.java
index ded8e792cfeb7885ef1a75cfd08e74cd2dbffb2e..6407b3b7df0b832f1843c4cd5d5d328b61219222 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralIEDPresent.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralIEDPresent.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 411,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 411 marshal size 2<br>
  * AppearanceObjectGeneralIEDPresent
  */
 public enum AppearanceObjectGeneralIEDPresent 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** None */
-// autogenerated using string template disenumpart2.txt
-
     NONE (0, "None"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Visible */
-// autogenerated using string template disenumpart2.txt
-
     VISIBLE (1, "Visible"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Partially Hidden */
-// autogenerated using string template disenumpart2.txt
-
     PARTIALLY_HIDDEN (2, "Partially Hidden"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Completely Hidden */
-// autogenerated using string template disenumpart2.txt
-
-    COMPLETELY_HIDDEN (3, "Completely Hidden"),;
-
-// autogenerated using string template disenumpart25.txt
+    COMPLETELY_HIDDEN (3, "Completely Hidden");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum AppearanceObjectGeneralIEDPresent
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralPredistributed.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralPredistributed.java
index 62e5a88d55766edde8fc5c080ec4e3b620047e40..c70339eefbf759aad6ffc457411f1cb5a052d659 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralPredistributed.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralPredistributed.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 406,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 406 marshal size 1<br>
  * AppearanceObjectGeneralPredistributed
  */
 public enum AppearanceObjectGeneralPredistributed 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Object Created During the Exercise */
-// autogenerated using string template disenumpart2.txt
-
     OBJECT_CREATED_DURING_THE_EXERCISE (0, "Object Created During the Exercise"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Object Predistributed Prior to Exercise Start */
-// autogenerated using string template disenumpart2.txt
-
-    OBJECT_PREDISTRIBUTED_PRIOR_TO_EXERCISE_START (1, "Object Predistributed Prior to Exercise Start"),;
-
-// autogenerated using string template disenumpart25.txt
+    OBJECT_PREDISTRIBUTED_PRIOR_TO_EXERCISE_START (1, "Object Predistributed Prior to Exercise Start");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum AppearanceObjectGeneralPredistributed
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificBreachState.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificBreachState.java
index 482f4fbc9ae584a1111686bbe6b3a9e84e4828d7..3a2b47fa5df8a3cfe4aed6f06e7006351a8e1640 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificBreachState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificBreachState.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 407,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 407 marshal size 2<br>
  * AppearanceObjectSpecificBreachState
  */
 public enum AppearanceObjectSpecificBreachState 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Breaching */
-// autogenerated using string template disenumpart2.txt
-
     NO_BREACHING (0, "No Breaching"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Breached */
-// autogenerated using string template disenumpart2.txt
-
     BREACHED (1, "Breached"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cleared */
-// autogenerated using string template disenumpart2.txt
-
-    CLEARED (2, "Cleared"),;
-
-// autogenerated using string template disenumpart25.txt
+    CLEARED (2, "Cleared");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum AppearanceObjectSpecificBreachState
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificChemicalType.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificChemicalType.java
index 9164460f02318e1ca2ab9e04f6d9281fdb26cec9..2b9e39190a2779a5f8225b7299017d9951f336a0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificChemicalType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificChemicalType.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 408,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 408 marshal size 2<br>
  * AppearanceObjectSpecificChemicalType
  */
 public enum AppearanceObjectSpecificChemicalType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hydrochloric */
-// autogenerated using string template disenumpart2.txt
-
     HYDROCHLORIC (1, "Hydrochloric"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** White Phosphorous */
-// autogenerated using string template disenumpart2.txt
-
     WHITE_PHOSPHOROUS (2, "White Phosphorous"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Red Phosphorous */
-// autogenerated using string template disenumpart2.txt
-
-    RED_PHOSPHOROUS (3, "Red Phosphorous"),;
-
-// autogenerated using string template disenumpart25.txt
+    RED_PHOSPHOROUS (3, "Red Phosphorous");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum AppearanceObjectSpecificChemicalType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearancePaintScheme.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearancePaintScheme.java
index 568fc555f24a612495c5dd26e9b16d252b940162..faeabfb3be69ff97e4238e68da8e6b872b659df5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearancePaintScheme.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearancePaintScheme.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 378,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 378 marshal size 1<br>
  * AppearancePaintScheme
  */
 public enum AppearancePaintScheme 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Uniform Color */
-// autogenerated using string template disenumpart2.txt
-
     UNIFORM_COLOR (0, "Uniform Color"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Camouflage */
-// autogenerated using string template disenumpart2.txt
-
-    CAMOUFLAGE (1, "Camouflage"),;
-
-// autogenerated using string template disenumpart25.txt
+    CAMOUFLAGE (1, "Camouflage");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum AppearancePaintScheme
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSubsurfaceHatch.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSubsurfaceHatch.java
index 2e0cdaabb54a60b105f184fb44def7fae83133b4..b5f7e49dcfcd7bce0516b59a5db94d99abd57212 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSubsurfaceHatch.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSubsurfaceHatch.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 388,
- * marshal size 3,
+ * Generated from XML, <br>
+ * UID 388 marshal size 3<br>
  * AppearanceSubsurfaceHatch
  */
 public enum AppearanceSubsurfaceHatch 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Applicable */
-// autogenerated using string template disenumpart2.txt
-
     NOT_APPLICABLE (0, "Not Applicable"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hatch Is Closed */
-// autogenerated using string template disenumpart2.txt
-
     HATCH_IS_CLOSED (1, "Hatch Is Closed"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hatch Is Open */
-// autogenerated using string template disenumpart2.txt
-
-    HATCH_IS_OPEN (4, "Hatch Is Open"),;
-
-// autogenerated using string template disenumpart25.txt
+    HATCH_IS_OPEN (4, "Hatch Is Open");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum AppearanceSubsurfaceHatch
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSupplyDeployed.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSupplyDeployed.java
index d9d51fd928c23d895ec583540da329ac14b5833d..aff2a2c0ebf69548e81e3accb53a3f701782d9c3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSupplyDeployed.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSupplyDeployed.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 399,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 399 marshal size 2<br>
  * AppearanceSupplyDeployed
  */
 public enum AppearanceSupplyDeployed 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Applicable */
-// autogenerated using string template disenumpart2.txt
-
     NOT_APPLICABLE (0, "Not Applicable"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Stowed */
-// autogenerated using string template disenumpart2.txt
-
     STOWED (1, "Stowed"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Deployed */
-// autogenerated using string template disenumpart2.txt
-
     DEPLOYED (2, "Deployed"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Deployed and Active */
-// autogenerated using string template disenumpart2.txt
-
-    DEPLOYED_AND_ACTIVE (3, "Deployed and Active"),;
-
-// autogenerated using string template disenumpart25.txt
+    DEPLOYED_AND_ACTIVE (3, "Deployed and Active");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum AppearanceSupplyDeployed
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceTrailingEffects.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceTrailingEffects.java
index 15b247a905ab13f2331a90be332d1e84288db85a..660dff44bef564dcd2ec03c3e4f586e2e1cc8ae2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceTrailingEffects.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceTrailingEffects.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 381,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 381 marshal size 2<br>
  * AppearanceTrailingEffects
  */
 public enum AppearanceTrailingEffects 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** None */
-// autogenerated using string template disenumpart2.txt
-
     NONE (0, "None"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Small */
-// autogenerated using string template disenumpart2.txt
-
     SMALL (1, "Small"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium */
-// autogenerated using string template disenumpart2.txt
-
     MEDIUM (2, "Medium"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Large */
-// autogenerated using string template disenumpart2.txt
-
-    LARGE (3, "Large"),;
-
-// autogenerated using string template disenumpart25.txt
+    LARGE (3, "Large");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum AppearanceTrailingEffects
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeMetric.java b/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeMetric.java
index c11697262cc5155de18bf5154985524cc30f576f..2e6bd3df17bc0356ef84a31cbfa938ab0ef43586 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeMetric.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeMetric.java
@@ -7,120 +7,47 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 58,
- * marshal size 5,
+ * Generated from XML, <br>
+ * UID 58 marshal size 5<br>
  * ArticulatedPartsTypeMetric
  */
 public enum ArticulatedPartsTypeMetric 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Specified */
-// autogenerated using string template disenumpart2.txt
-
     NOT_SPECIFIED (0, "Not Specified"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Position */
-// autogenerated using string template disenumpart2.txt
-
     POSITION (1, "Position"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Position Rate */
-// autogenerated using string template disenumpart2.txt
-
     POSITION_RATE (2, "Position Rate"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Extension */
-// autogenerated using string template disenumpart2.txt
-
     EXTENSION (3, "Extension"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Extension Rate */
-// autogenerated using string template disenumpart2.txt
-
     EXTENSION_RATE (4, "Extension Rate"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** X */
-// autogenerated using string template disenumpart2.txt
-
     X (5, "X"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** X Rate */
-// autogenerated using string template disenumpart2.txt
-
     X_RATE (6, "X Rate"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Y */
-// autogenerated using string template disenumpart2.txt
-
     Y (7, "Y"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Y Rate */
-// autogenerated using string template disenumpart2.txt
-
     Y_RATE (8, "Y Rate"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Z */
-// autogenerated using string template disenumpart2.txt
-
     Z (9, "Z"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Z Rate */
-// autogenerated using string template disenumpart2.txt
-
     Z_RATE (10, "Z Rate"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Azimuth */
-// autogenerated using string template disenumpart2.txt
-
     AZIMUTH (11, "Azimuth"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Azimuth Rate */
-// autogenerated using string template disenumpart2.txt
-
     AZIMUTH_RATE (12, "Azimuth Rate"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Elevation */
-// autogenerated using string template disenumpart2.txt
-
     ELEVATION (13, "Elevation"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Elevation Rate */
-// autogenerated using string template disenumpart2.txt
-
     ELEVATION_RATE (14, "Elevation Rate"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Rotation */
-// autogenerated using string template disenumpart2.txt
-
     ROTATION (15, "Rotation"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Rotation Rate */
-// autogenerated using string template disenumpart2.txt
-
-    ROTATION_RATE (16, "Rotation Rate"),;
-
-// autogenerated using string template disenumpart25.txt
+    ROTATION_RATE (16, "Rotation Rate");
 
     private int value;
     private final String description;
@@ -170,8 +97,6 @@ public enum ArticulatedPartsTypeMetric
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AttachedPartDetachedIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/AttachedPartDetachedIndicator.java
index 0a405aad0b8a5ed8ad01b8375ae424d4912530dd..f66a950a6edc582578387148e64220b20137f889 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AttachedPartDetachedIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AttachedPartDetachedIndicator.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 415,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 415 marshal size 8<br>
  * AttachedPartDetachedIndicator
  */
 public enum AttachedPartDetachedIndicator 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Attached */
-// autogenerated using string template disenumpart2.txt
-
     ATTACHED (0, "Attached"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Detached */
-// autogenerated using string template disenumpart2.txt
-
-    DETACHED (1, "Detached"),;
-
-// autogenerated using string template disenumpart25.txt
+    DETACHED (1, "Detached");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum AttachedPartDetachedIndicator
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AustralianCategoryOverlay.java b/src-generated/edu/nps/moves/dis7/enumerations/AustralianCategoryOverlay.java
index 242488f837697f2c7a11a317818c8b0d6b8bf3a7..a864f51d0e58e7d37a9ce85521cff147abbadf75 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AustralianCategoryOverlay.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AustralianCategoryOverlay.java
@@ -7,54 +7,25 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 500,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 500 marshal size 8<br>
  * AustralianCategoryOverlay
  */
 public enum AustralianCategoryOverlay 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Australian Army */
-// autogenerated using string template disenumpart2.txt
-
     AUSTRALIAN_ARMY (11, "Australian Army"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Royal Australian Air Force (RAAF) */
-// autogenerated using string template disenumpart2.txt
-
     ROYAL_AUSTRALIAN_AIR_FORCE_RAAF (13, "Royal Australian Air Force (RAAF)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Royal Australian Navy (RAN) */
-// autogenerated using string template disenumpart2.txt
-
     ROYAL_AUSTRALIAN_NAVY_RAN (14, "Royal Australian Navy (RAN)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Australian Special Operations Command (SOCOMD) */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Australian Special Operations Command (SOCOMD)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Australian Department of Home Affairs */
-// autogenerated using string template disenumpart2.txt
-
     CREATE_ENTITY_RELIABLE (51, "Australian Department of Home Affairs"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Australian Federal Police (AFP) */
-// autogenerated using string template disenumpart2.txt
-
-    REMOVE_ENTITY_RELIABLE (52, "Australian Federal Police (AFP)"),;
-
-// autogenerated using string template disenumpart25.txt
+    REMOVE_ENTITY_RELIABLE (52, "Australian Federal Police (AFP)");
 
     private int value;
     private final String description;
@@ -104,8 +75,6 @@ public enum AustralianCategoryOverlay
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/BeamStatusBeamState.java b/src-generated/edu/nps/moves/dis7/enumerations/BeamStatusBeamState.java
index 2260597ce767bc389ce6a575f835a71744d2d0dc..e4b469fd0fbbc0b3fbe5be9e1b4fad05c22a03aa 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/BeamStatusBeamState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/BeamStatusBeamState.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 318,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 318 marshal size 1<br>
  * BeamStatusBeamState
  */
 public enum BeamStatusBeamState 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Active */
-// autogenerated using string template disenumpart2.txt
-
     ACTIVE (0, "Active"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Deactivated */
-// autogenerated using string template disenumpart2.txt
-
-    DEACTIVATED (1, "Deactivated"),;
-
-// autogenerated using string template disenumpart25.txt
+    DEACTIVATED (1, "Deactivated");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum BeamStatusBeamState
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/BuildingPaintScheme.java b/src-generated/edu/nps/moves/dis7/enumerations/BuildingPaintScheme.java
index 729584bcfddca5870526bbadd46854f1c238b774..c3022ac15c3b101d02afd16aceded36ba710333f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/BuildingPaintScheme.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/BuildingPaintScheme.java
@@ -7,24 +7,15 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 464,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 464 marshal size 8<br>
  * BuildingPaintScheme
  */
 public enum BuildingPaintScheme 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Default */
-// autogenerated using string template disenumpart2.txt
-
-    DEFAULT (0, "Default"),;
-
-// autogenerated using string template disenumpart25.txt
+    DEFAULT (0, "Default");
 
     private int value;
     private final String description;
@@ -74,8 +65,6 @@ public enum BuildingPaintScheme
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSClearChannel.java b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSClearChannel.java
index 2c611e47dbacbbac660ffcff46d79b3d5b6b1790..5ab9c3966fb836585c108a82e5fef0174ce9cb7f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSClearChannel.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSClearChannel.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 171,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 171 marshal size 8<br>
  * CCTTSINCGARSClearChannel
  */
 public enum CCTTSINCGARSClearChannel 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not clear channel */
-// autogenerated using string template disenumpart2.txt
-
     NOT_CLEAR_CHANNEL (0, "Not clear channel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Clear channel */
-// autogenerated using string template disenumpart2.txt
-
-    CLEAR_CHANNEL (1, "Clear channel"),;
-
-// autogenerated using string template disenumpart25.txt
+    CLEAR_CHANNEL (1, "Clear channel");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum CCTTSINCGARSClearChannel
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSStartofMessage.java b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSStartofMessage.java
index b3e95faf61bc6ca89189b57e979ba4646c973fec..08295f4662e07521e7f61a1bac06ccd1e9bbc184 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSStartofMessage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSStartofMessage.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 170,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 170 marshal size 8<br>
  * CCTTSINCGARSStartofMessage
  */
 public enum CCTTSINCGARSStartofMessage 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not start of message */
-// autogenerated using string template disenumpart2.txt
-
     NOT_START_OF_MESSAGE (0, "Not start of message"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Start of Message */
-// autogenerated using string template disenumpart2.txt
-
-    START_OF_MESSAGE (1, "Start of Message"),;
-
-// autogenerated using string template disenumpart25.txt
+    START_OF_MESSAGE (1, "Start of Message");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum CCTTSINCGARSStartofMessage
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CapabilityReport.java b/src-generated/edu/nps/moves/dis7/enumerations/CapabilityReport.java
index 8ee6ea52acd800ab39686d22ea0e28c5decc7d54..edd4d9c43a953fe16dd587b44fe244345d5cd996 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CapabilityReport.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CapabilityReport.java
@@ -7,72 +7,31 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 358,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 358 marshal size 8<br>
  * CapabilityReport
  */
 public enum CapabilityReport 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Communications Capability (CA) */
-// autogenerated using string template disenumpart2.txt
-
     NO_COMMUNICATIONS_CAPABILITY_CA (0, "No Communications Capability (CA)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Reserved */
-// autogenerated using string template disenumpart2.txt
-
     RESERVED (1, "Reserved"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Reserved */
-// autogenerated using string template disenumpart2.txt
-
     RESERVED_2 (2, "Reserved"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Reserved */
-// autogenerated using string template disenumpart2.txt
-
     RESERVED_3 (3, "Reserved"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Signifies at Least Comm-A and Comm-B Capability and Ability to Set CA Code 7 and on the Ground */
-// autogenerated using string template disenumpart2.txt
-
     SIGNIFIES_AT_LEAST_COMM_A_AND_COMM_B_CAPABILITY_AND_ABILITY_TO_SET_CA_CODE_7_AND_ON_THE_GROUND (4, "Signifies at Least Comm-A and Comm-B Capability and Ability to Set CA Code 7 and on the Ground"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Signifies at Least Comm-A and Comm-B capability and Ability to Set CA Code 7 and Airborne */
-// autogenerated using string template disenumpart2.txt
-
     SIGNIFIES_AT_LEAST_COMM_A_AND_COMM_B_CAPABILITY_AND_ABILITY_TO_SET_CA_CODE_7_AND_AIRBORNE (5, "Signifies at Least Comm-A and Comm-B capability and Ability to Set CA Code 7 and Airborne"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Signifies at Least Comm-A and Comm-B capability and Ability to Set CA Code 7 and Either Airborne or on the Ground */
-// autogenerated using string template disenumpart2.txt
-
     SIGNIFIES_AT_LEAST_COMM_A_AND_COMM_B_CAPABILITY_AND_ABILITY_TO_SET_CA_CODE_7_AND_EITHER_AIRBORNE_OR_ON_THE_GROUND (6, "Signifies at Least Comm-A and Comm-B capability and Ability to Set CA Code 7 and Either Airborne or on the Ground"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Signifies the Downlink Request (DR) Field Is Not Equal To 0 and The Flight Status (FS) Field Equals 2, 3, 4 or 5, and Either Airborne or on the Ground */
-// autogenerated using string template disenumpart2.txt
-
     SIGNIFIES_THE_DOWNLINK_REQUEST_DR_FIELD_IS_NOT_EQUAL_TO_0_AND_THE_FLIGHT_STATUS_FS_FIELD_EQUALS_2_3_4_OR_5_AND_EITHER_AIRBORNE_OR_ON_THE_GROUND (7, "Signifies the Downlink Request (DR) Field Is Not Equal To 0 and The Flight Status (FS) Field Equals 2, 3, 4 or 5, and Either Airborne or on the Ground"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
-    NO_STATEMENT (255, "No Statement"),;
-
-// autogenerated using string template disenumpart25.txt
+    NO_STATEMENT (255, "No Statement");
 
     private int value;
     private final String description;
@@ -122,8 +81,6 @@ public enum CapabilityReport
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java b/src-generated/edu/nps/moves/dis7/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java
index 2876af08ad9efbb8d8bc86f75ecd30b007faa9b9..cc81d1ae9ab98faa705cedb5d390e03e46a94b91 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java
@@ -7,24 +7,15 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 610,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 610 marshal size 8<br>
  * Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms
  */
 public enum Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
-    OTHER (1, "Other"),;
-
-// autogenerated using string template disenumpart25.txt
+    OTHER (1, "Other");
 
     private int value;
     private final String description;
@@ -74,8 +65,6 @@ public enum Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms implements
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java b/src-generated/edu/nps/moves/dis7/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java
index 1cf2069212f89cab31daea6823dd9cb795df35bf..1cc8935e371676e158acf2a4161c304e02f5710e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java
@@ -7,48 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 611,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 611 marshal size 8<br>
  * Class11SupplyCategorySupplies(NonDoctrinal)
  */
 public enum Class11SupplyCategorySuppliesNonDoctrinal implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (1, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pallets */
-// autogenerated using string template disenumpart2.txt
-
     PALLETS (2, "Pallets"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fuel Tanks, Drums and Bladders */
-// autogenerated using string template disenumpart2.txt
-
     FUEL_TANKS_DRUMS_AND_BLADDERS (3, "Fuel Tanks, Drums and Bladders"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Chests */
-// autogenerated using string template disenumpart2.txt
-
     CHESTS (4, "Chests"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Boxes */
-// autogenerated using string template disenumpart2.txt
-
-    BOXES (5, "Boxes"),;
-
-// autogenerated using string template disenumpart25.txt
+    BOXES (5, "Boxes");
 
     private int value;
     private final String description;
@@ -98,8 +73,6 @@ public enum Class11SupplyCategorySuppliesNonDoctrinal implements Category
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java b/src-generated/edu/nps/moves/dis7/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java
index 7065389d3b095fa3a63525a8d087d00ac4e14577..a9567ec799b8fdc17db2a92f35ecab9e70d81975 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java
@@ -7,90 +7,37 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 612,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 612 marshal size 8<br>
  * Class12SupplyCategorySlingLoads(NonDoctrinal)
  */
 public enum Class12SupplyCategorySlingLoadsNonDoctrinal implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (1, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sling Load, Blivet */
-// autogenerated using string template disenumpart2.txt
-
     SLING_LOAD_BLIVET (2, "Sling Load, Blivet"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sling Load, Crate */
-// autogenerated using string template disenumpart2.txt
-
     SLING_LOAD_CRATE (3, "Sling Load, Crate"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sling Load, Water Bucket */
-// autogenerated using string template disenumpart2.txt
-
     SLING_LOAD_WATER_BUCKET (4, "Sling Load, Water Bucket"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sling Load, Vehicles */
-// autogenerated using string template disenumpart2.txt
-
     SLING_LOAD_VEHICLES (5, "Sling Load, Vehicles"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sling Load, Howitzer */
-// autogenerated using string template disenumpart2.txt
-
     SLING_LOAD_HOWITZER (6, "Sling Load, Howitzer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sling Load, Collapsible */
-// autogenerated using string template disenumpart2.txt
-
     SLING_LOAD_COLLAPSIBLE (7, "Sling Load, Collapsible"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sling Load, Bladder */
-// autogenerated using string template disenumpart2.txt
-
     SLING_LOAD_BLADDER (8, "Sling Load, Bladder"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sling Load, Pallet of Crates */
-// autogenerated using string template disenumpart2.txt
-
     SLING_LOAD_PALLET_OF_CRATES (9, "Sling Load, Pallet of Crates"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sling Load, Helicopters */
-// autogenerated using string template disenumpart2.txt
-
     SLING_LOAD_HELICOPTERS (10, "Sling Load, Helicopters"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sling Load, Hoist */
-// autogenerated using string template disenumpart2.txt
-
     SLING_LOAD_HOIST (11, "Sling Load, Hoist"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sling Load, Concrete Block */
-// autogenerated using string template disenumpart2.txt
-
-    SLING_LOAD_CONCRETE_BLOCK (12, "Sling Load, Concrete Block"),;
-
-// autogenerated using string template disenumpart25.txt
+    SLING_LOAD_CONCRETE_BLOCK (12, "Sling Load, Concrete Block");
 
     private int value;
     private final String description;
@@ -140,8 +87,6 @@ public enum Class12SupplyCategorySlingLoadsNonDoctrinal implements Category
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class1SupplyCategorySubsistence.java b/src-generated/edu/nps/moves/dis7/enumerations/Class1SupplyCategorySubsistence.java
index 2afe7c07fccfd0c63390637a80c428157fdd465f..134b2f920782d4f14b3ecb267dbdeec8b58ba0fe 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class1SupplyCategorySubsistence.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class1SupplyCategorySubsistence.java
@@ -7,54 +7,25 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 601,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 601 marshal size 8<br>
  * Class1SupplyCategorySubsistence
  */
 public enum Class1SupplyCategorySubsistence implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (1, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** A - Non-Perishable */
-// autogenerated using string template disenumpart2.txt
-
     A_NON_PERISHABLE (2, "A - Non-Perishable"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** C - Combat Rations */
-// autogenerated using string template disenumpart2.txt
-
     C_COMBAT_RATIONS (3, "C - Combat Rations"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** R - Refrigerated */
-// autogenerated using string template disenumpart2.txt
-
     R_REFRIGERATED (4, "R - Refrigerated"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** S - Other Non-Refrigerated */
-// autogenerated using string template disenumpart2.txt
-
     S_OTHER_NON_REFRIGERATED (5, "S - Other Non-Refrigerated"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** W - Water */
-// autogenerated using string template disenumpart2.txt
-
-    W_WATER (6, "W - Water"),;
-
-// autogenerated using string template disenumpart25.txt
+    W_WATER (6, "W - Water");
 
     private int value;
     private final String description;
@@ -104,8 +75,6 @@ public enum Class1SupplyCategorySubsistence implements Category
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java b/src-generated/edu/nps/moves/dis7/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java
index 0a3ff1638487dd8e1352d897b386f863ceb6d7d7..f50b20dd487f547891eb039a1d93c4939ded7daf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java
@@ -7,66 +7,29 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 602,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 602 marshal size 8<br>
  * Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies
  */
 public enum Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (1, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** A - Air */
-// autogenerated using string template disenumpart2.txt
-
     A_AIR (2, "A - Air"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** B - Ground Support Materiel */
-// autogenerated using string template disenumpart2.txt
-
     B_GROUND_SUPPORT_MATERIEL (3, "B - Ground Support Materiel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** E - General Supplies */
-// autogenerated using string template disenumpart2.txt
-
     E_GENERAL_SUPPLIES (4, "E - General Supplies"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** F - Clothing */
-// autogenerated using string template disenumpart2.txt
-
     F_CLOTHING (5, "F - Clothing"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** G - Electronics */
-// autogenerated using string template disenumpart2.txt
-
     G_ELECTRONICS (6, "G - Electronics"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M - Weapons (Humans) */
-// autogenerated using string template disenumpart2.txt
-
     M_WEAPONS_HUMANS (7, "M - Weapons (Humans)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** T - Industrial Supplies */
-// autogenerated using string template disenumpart2.txt
-
-    T_INDUSTRIAL_SUPPLIES (8, "T - Industrial Supplies"),;
-
-// autogenerated using string template disenumpart25.txt
+    T_INDUSTRIAL_SUPPLIES (8, "T - Industrial Supplies");
 
     private int value;
     private final String description;
@@ -116,8 +79,6 @@ public enum Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies im
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java b/src-generated/edu/nps/moves/dis7/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java
index 32cc45ef9700b75fc8345baf6e14ac91d5520dfa..d4458f8608898f848d1bbb0c46f90831ac5c6ce8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 603,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 603 marshal size 8<br>
  * Class3SupplyCategoryPetroleumOilsLubricants
  */
 public enum Class3SupplyCategoryPetroleumOilsLubricants implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (1, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** A - POL for Air Vehicles */
-// autogenerated using string template disenumpart2.txt
-
     A_POL_FOR_AIR_VEHICLES (2, "A - POL for Air Vehicles"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** W - POL for Land Vehicles */
-// autogenerated using string template disenumpart2.txt
-
     W_POL_FOR_LAND_VEHICLES (3, "W - POL for Land Vehicles"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** P - Packaged POL */
-// autogenerated using string template disenumpart2.txt
-
-    P_PACKAGED_POL (4, "P - Packaged POL"),;
-
-// autogenerated using string template disenumpart25.txt
+    P_PACKAGED_POL (4, "P - Packaged POL");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum Class3SupplyCategoryPetroleumOilsLubricants implements Category
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class4SupplyCategoryConstructionMaterials.java b/src-generated/edu/nps/moves/dis7/enumerations/Class4SupplyCategoryConstructionMaterials.java
index 4ef7a3a1084832980598b9d77e00613327ad2c59..f7c6d884a3e7b9bf16de135dd307af7c0e756a99 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class4SupplyCategoryConstructionMaterials.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class4SupplyCategoryConstructionMaterials.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 604,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 604 marshal size 8<br>
  * Class4SupplyCategoryConstructionMaterials
  */
 public enum Class4SupplyCategoryConstructionMaterials implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (1, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** A - Construction */
-// autogenerated using string template disenumpart2.txt
-
     A_CONSTRUCTION (2, "A - Construction"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** B - Barrier */
-// autogenerated using string template disenumpart2.txt
-
-    B_BARRIER (3, "B - Barrier"),;
-
-// autogenerated using string template disenumpart25.txt
+    B_BARRIER (3, "B - Barrier");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum Class4SupplyCategoryConstructionMaterials implements Category
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class6SupplyCategoryPersonnelDemandItems.java b/src-generated/edu/nps/moves/dis7/enumerations/Class6SupplyCategoryPersonnelDemandItems.java
index 2bcf29b0efb561f692e9f92cd9d304dc223f100e..1b481822cd239bc926bdf1a7f33a117a6d0f1742 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class6SupplyCategoryPersonnelDemandItems.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class6SupplyCategoryPersonnelDemandItems.java
@@ -7,24 +7,15 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 606,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 606 marshal size 8<br>
  * Class6SupplyCategoryPersonnelDemandItems
  */
 public enum Class6SupplyCategoryPersonnelDemandItems implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
-    OTHER (1, "Other"),;
-
-// autogenerated using string template disenumpart25.txt
+    OTHER (1, "Other");
 
     private int value;
     private final String description;
@@ -74,8 +65,6 @@ public enum Class6SupplyCategoryPersonnelDemandItems implements Category
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class7SupplyCategoryMajorItems.java b/src-generated/edu/nps/moves/dis7/enumerations/Class7SupplyCategoryMajorItems.java
index c5b3d91ae1d56636e7dab8c36bc83f8ddabb8cb0..9a134c742b80a5b741077432e593c143dc21bcfd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class7SupplyCategoryMajorItems.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class7SupplyCategoryMajorItems.java
@@ -7,156 +7,59 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 607,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 607 marshal size 8<br>
  * Class7SupplyCategoryMajorItems
  */
 public enum Class7SupplyCategoryMajorItems implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (1, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** A - Air (Not used, as described in Air Domain) */
-// autogenerated using string template disenumpart2.txt
-
     A_AIR_NOT_USED_AS_DESCRIBED_IN_AIR_DOMAIN (2, "A - Air (Not used, as described in Air Domain)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** B - Ground Support Materiel */
-// autogenerated using string template disenumpart2.txt
-
     B_GROUND_SUPPORT_MATERIEL (3, "B - Ground Support Materiel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** D - Admin Vehicles (Not used, as described in Land Domain) */
-// autogenerated using string template disenumpart2.txt
-
     D_ADMIN_VEHICLES_NOT_USED_AS_DESCRIBED_IN_LAND_DOMAIN (4, "D - Admin Vehicles (Not used, as described in Land Domain)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** G - Electronics */
-// autogenerated using string template disenumpart2.txt
-
     G_ELECTRONICS (5, "G - Electronics"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** J - Racks, Adaptors, Pylons */
-// autogenerated using string template disenumpart2.txt
-
     J_RACKS_ADAPTORS_PYLONS (6, "J - Racks, Adaptors, Pylons"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** K - Tactical Vehicles (Not used, as described in Land Domain) */
-// autogenerated using string template disenumpart2.txt
-
     K_TACTICAL_VEHICLES_NOT_USED_AS_DESCRIBED_IN_LAND_DOMAIN (7, "K - Tactical Vehicles (Not used, as described in Land Domain)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** L - Missiles (Not used, as described in Munition Domain) */
-// autogenerated using string template disenumpart2.txt
-
     L_MISSILES_NOT_USED_AS_DESCRIBED_IN_MUNITION_DOMAIN (8, "L - Missiles (Not used, as described in Munition Domain)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M - Weapons */
-// autogenerated using string template disenumpart2.txt
-
     M_WEAPONS (9, "M - Weapons"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** N - Special Weapons */
-// autogenerated using string template disenumpart2.txt
-
     N_SPECIAL_WEAPONS (10, "N - Special Weapons"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** X - Aircraft Engines */
-// autogenerated using string template disenumpart2.txt
-
     X_AIRCRAFT_ENGINES (11, "X - Aircraft Engines"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Drop Tank */
-// autogenerated using string template disenumpart2.txt
-
     DROP_TANK (20, "Drop Tank"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Conformal Fuel Tank */
-// autogenerated using string template disenumpart2.txt
-
     CONFORMAL_FUEL_TANK (21, "Conformal Fuel Tank"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Luggage Pod */
-// autogenerated using string template disenumpart2.txt
-
     LUGGAGE_POD (22, "Luggage Pod"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** ECM Pod */
-// autogenerated using string template disenumpart2.txt
-
     ECM_POD (23, "ECM Pod"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Para-Drogue */
-// autogenerated using string template disenumpart2.txt
-
     PARA_DROGUE (24, "Para-Drogue"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Targeting Pod */
-// autogenerated using string template disenumpart2.txt
-
     TARGETING_POD (25, "Targeting Pod"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fairing */
-// autogenerated using string template disenumpart2.txt
-
     FAIRING (26, "Fairing"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Air Refuelling Pod */
-// autogenerated using string template disenumpart2.txt
-
     AIR_REFUELLING_POD (27, "Air Refuelling Pod"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Heavy Airdrop */
-// autogenerated using string template disenumpart2.txt
-
     IDENTIFICATION_FRIEND_OR_FOE (28, "Heavy Airdrop"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Container Delivery System (CDS) Airdrop */
-// autogenerated using string template disenumpart2.txt
-
     CONTAINER_DELIVERY_SYSTEM_CDS_AIRDROP (29, "Container Delivery System (CDS) Airdrop"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Rocket Pod/Launcher */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Rocket Pod/Launcher"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tactical Pod */
-// autogenerated using string template disenumpart2.txt
-
-    TACTICAL_POD (31, "Tactical Pod"),;
-
-// autogenerated using string template disenumpart25.txt
+    TACTICAL_POD (31, "Tactical Pod");
 
     private int value;
     private final String description;
@@ -206,8 +109,6 @@ public enum Class7SupplyCategoryMajorItems implements Category
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class8SupplyCategoryMedicalMaterial.java b/src-generated/edu/nps/moves/dis7/enumerations/Class8SupplyCategoryMedicalMaterial.java
index 075aeb84ed4273fcb9b62380573d53375d7ec700..afc46b3a9bca2abdd535912f204a054aeb1f1144 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class8SupplyCategoryMedicalMaterial.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class8SupplyCategoryMedicalMaterial.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 608,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 608 marshal size 8<br>
  * Class8SupplyCategoryMedicalMaterial
  */
 public enum Class8SupplyCategoryMedicalMaterial implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (1, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** A - Medical Materiel */
-// autogenerated using string template disenumpart2.txt
-
     A_MEDICAL_MATERIEL (2, "A - Medical Materiel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** B - Blood / Fluids */
-// autogenerated using string template disenumpart2.txt
-
-    B_BLOOD_FLUIDS (3, "B - Blood / Fluids"),;
-
-// autogenerated using string template disenumpart25.txt
+    B_BLOOD_FLUIDS (3, "B - Blood / Fluids");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum Class8SupplyCategoryMedicalMaterial implements Category
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class9SupplyCategoryRepairPartsandComponents.java b/src-generated/edu/nps/moves/dis7/enumerations/Class9SupplyCategoryRepairPartsandComponents.java
index 961c83dbe26c596f1ed1bd257cba844b1bccb4c4..950331433fb691888fc0d84c82f656f9424ba212 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class9SupplyCategoryRepairPartsandComponents.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class9SupplyCategoryRepairPartsandComponents.java
@@ -7,78 +7,33 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 609,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 609 marshal size 8<br>
  * Class9SupplyCategoryRepairPartsandComponents
  */
 public enum Class9SupplyCategoryRepairPartsandComponents implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (1, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** A - Air */
-// autogenerated using string template disenumpart2.txt
-
     A_AIR (2, "A - Air"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** B - Ground Support Materiel */
-// autogenerated using string template disenumpart2.txt
-
     B_GROUND_SUPPORT_MATERIEL (3, "B - Ground Support Materiel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** D - Admin Vehicles */
-// autogenerated using string template disenumpart2.txt
-
     D_ADMIN_VEHICLES (4, "D - Admin Vehicles"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** G - Electronics */
-// autogenerated using string template disenumpart2.txt
-
     G_ELECTRONICS (5, "G - Electronics"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** K - Tactical Vehicles, Any repair part for a modelled function of a platform, not related to Mobility, Firepower, Sensor, or Communications, e.g. Bulldozer Blade, Crane, Winch, Mine Plow, etc. */
-// autogenerated using string template disenumpart2.txt
-
     K_TACTICAL_VEHICLES (6, "K - Tactical Vehicles"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** L - Missiles */
-// autogenerated using string template disenumpart2.txt
-
     L_MISSILES (7, "L - Missiles"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M - Weapons */
-// autogenerated using string template disenumpart2.txt
-
     M_WEAPONS (8, "M - Weapons"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** N - Special Weapons */
-// autogenerated using string template disenumpart2.txt
-
     N_SPECIAL_WEAPONS (9, "N - Special Weapons"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** X - Aircraft Engines */
-// autogenerated using string template disenumpart2.txt
-
-    X_AIRCRAFT_ENGINES (10, "X - Aircraft Engines"),;
-
-// autogenerated using string template disenumpart25.txt
+    X_AIRCRAFT_ENGINES (10, "X - Aircraft Engines");
 
     private int value;
     private final String description;
@@ -128,8 +83,6 @@ public enum Class9SupplyCategoryRepairPartsandComponents implements Category
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CollisionType.java b/src-generated/edu/nps/moves/dis7/enumerations/CollisionType.java
index 22c7f808afe6f46f413128288ea4f5c8b5c66d57..d0228c5c601b852eb64e10faacd30d2d7b1c0be6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CollisionType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CollisionType.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 189,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 189 marshal size 8<br>
  * CollisionType
  */
 public enum CollisionType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Inelastic */
-// autogenerated using string template disenumpart2.txt
-
     INELASTIC (0, "Inelastic"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Elastic */
-// autogenerated using string template disenumpart2.txt
-
     ELASTIC (1, "Elastic"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Boom nozzle has cleared the receivers refueling receptacle, Collision Type 55 indicates that during an aerial refueling exercise the boom nozzle has cleared the receiver's refueling receptacle. */
-// autogenerated using string template disenumpart2.txt
-
-    ACKNOWLEDGE_RELIABLE (55, "Boom nozzle has cleared the receivers refueling receptacle"),;
-
-// autogenerated using string template disenumpart25.txt
+    ACKNOWLEDGE_RELIABLE (55, "Boom nozzle has cleared the receivers refueling receptacle");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum CollisionType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Color.java b/src-generated/edu/nps/moves/dis7/enumerations/Color.java
index 13940c15a1135d141e3c9471e22fb9b4610021bf..ce679c4cb9bafc7b9c3661e4bb063fdebbc67986 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Color.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Color.java
@@ -7,979 +7,335 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 463, marshal size 8,
- * Color
+ * Generated from XML, <br>
+ * UID 463 marshal size 8<br>
+ * Color<br>
  * The color values 1 to 15 are defined in the HTML 3.0 specification; color values 20 to 159 are defined in the SVG 1.0 specification
  */
 public enum Color 
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Specified */
-// autogenerated using string template disenumpart2.txt
-
     NOT_SPECIFIED (0, "Not Specified"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** White VGA */
-// autogenerated using string template disenumpart2.txt
-
     WHITE_VGA (1, "White VGA"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Red VGA */
-// autogenerated using string template disenumpart2.txt
-
     RED_VGA (2, "Red VGA"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Yellow VGA */
-// autogenerated using string template disenumpart2.txt
-
     YELLOW_VGA (3, "Yellow VGA"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Lime VGA */
-// autogenerated using string template disenumpart2.txt
-
     LIME_VGA (4, "Lime VGA"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cyan VGA */
-// autogenerated using string template disenumpart2.txt
-
     CYAN_VGA (5, "Cyan VGA"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Blue VGA */
-// autogenerated using string template disenumpart2.txt
-
     BLUE_VGA (6, "Blue VGA"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Magenta VGA */
-// autogenerated using string template disenumpart2.txt
-
     MAGENTA_VGA (7, "Magenta VGA"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Grey VGA */
-// autogenerated using string template disenumpart2.txt
-
     GREY_VGA (8, "Grey VGA"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Silver VGA */
-// autogenerated using string template disenumpart2.txt
-
     SILVER_VGA (9, "Silver VGA"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Maroon VGA */
-// autogenerated using string template disenumpart2.txt
-
     MAROON_VGA (10, "Maroon VGA"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Olive VGA */
-// autogenerated using string template disenumpart2.txt
-
     OLIVE_VGA (11, "Olive VGA"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Green VGA */
-// autogenerated using string template disenumpart2.txt
-
     GREEN_VGA (12, "Green VGA"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Teal VGA */
-// autogenerated using string template disenumpart2.txt
-
     TEAL_VGA (13, "Teal VGA"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Navy VGA */
-// autogenerated using string template disenumpart2.txt
-
     NAVY_VGA (14, "Navy VGA"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Purple VGA */
-// autogenerated using string template disenumpart2.txt
-
     PURPLE_VGA (15, "Purple VGA"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Reserved */
-// autogenerated using string template disenumpart2.txt
-
     RESERVED (16, "Reserved"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Reserved */
-// autogenerated using string template disenumpart2.txt
-
     RESERVED_2 (17, "Reserved"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Reserved */
-// autogenerated using string template disenumpart2.txt
-
     RESERVED_3 (18, "Reserved"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Reserved */
-// autogenerated using string template disenumpart2.txt
-
     RESERVED_4 (19, "Reserved"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Black */
-// autogenerated using string template disenumpart2.txt
-
     BLACK (20, "Black"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Navy */
-// autogenerated using string template disenumpart2.txt
-
     NAVY (21, "Navy"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dark Blue */
-// autogenerated using string template disenumpart2.txt
-
     DARK_BLUE (22, "Dark Blue"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium Blue */
-// autogenerated using string template disenumpart2.txt
-
     MEDIUM_BLUE (23, "Medium Blue"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Blue */
-// autogenerated using string template disenumpart2.txt
-
     BLUE (24, "Blue"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dark Green */
-// autogenerated using string template disenumpart2.txt
-
     DARK_GREEN (25, "Dark Green"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Green */
-// autogenerated using string template disenumpart2.txt
-
     GREEN (26, "Green"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Teal */
-// autogenerated using string template disenumpart2.txt
-
     TEAL (27, "Teal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dark Cyan */
-// autogenerated using string template disenumpart2.txt
-
     IDENTIFICATION_FRIEND_OR_FOE (28, "Dark Cyan"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Deep Sky Blue */
-// autogenerated using string template disenumpart2.txt
-
     DEEP_SKY_BLUE (29, "Deep Sky Blue"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dark Turquoise */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Dark Turquoise"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium Spring Green */
-// autogenerated using string template disenumpart2.txt
-
     MEDIUM_SPRING_GREEN (31, "Medium Spring Green"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Lime */
-// autogenerated using string template disenumpart2.txt
-
     LIME (32, "Lime"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Spring Green */
-// autogenerated using string template disenumpart2.txt
-
     SPRING_GREEN (33, "Spring Green"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cyan */
-// autogenerated using string template disenumpart2.txt
-
     CYAN (34, "Cyan"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Midnight Blue */
-// autogenerated using string template disenumpart2.txt
-
     MIDNIGHT_BLUE (35, "Midnight Blue"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dodger Blue */
-// autogenerated using string template disenumpart2.txt
-
     DODGER_BLUE (36, "Dodger Blue"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light Sea Green */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT_SEA_GREEN (37, "Light Sea Green"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Forest Green */
-// autogenerated using string template disenumpart2.txt
-
     FOREST_GREEN (38, "Forest Green"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sea Green */
-// autogenerated using string template disenumpart2.txt
-
     SEA_GREEN (39, "Sea Green"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dark Slate Gray */
-// autogenerated using string template disenumpart2.txt
-
     DARK_SLATE_GRAY (40, "Dark Slate Gray"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Lime Green */
-// autogenerated using string template disenumpart2.txt
-
     LIME_GREEN (41, "Lime Green"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium Sea Green */
-// autogenerated using string template disenumpart2.txt
-
     MEDIUM_SEA_GREEN (42, "Medium Sea Green"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Turquoise */
-// autogenerated using string template disenumpart2.txt
-
     TURQUOISE (43, "Turquoise"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Royal Blue */
-// autogenerated using string template disenumpart2.txt
-
     ROYAL_BLUE (44, "Royal Blue"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Steel Blue */
-// autogenerated using string template disenumpart2.txt
-
     STEEL_BLUE (45, "Steel Blue"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dark Slate Blue */
-// autogenerated using string template disenumpart2.txt
-
     TIME_SPACE_POSITION_INFORMATION (46, "Dark Slate Blue"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium Turquoise */
-// autogenerated using string template disenumpart2.txt
-
     MEDIUM_TURQUOISE (47, "Medium Turquoise"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Indigo */
-// autogenerated using string template disenumpart2.txt
-
     INDIGO (48, "Indigo"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dark Olive Green */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_FIRE (49, "Dark Olive Green"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cadet Blue */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "Cadet Blue"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cornflower Blue */
-// autogenerated using string template disenumpart2.txt
-
     CREATE_ENTITY_RELIABLE (51, "Cornflower Blue"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium Aquamarine */
-// autogenerated using string template disenumpart2.txt
-
     REMOVE_ENTITY_RELIABLE (52, "Medium Aquamarine"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dim Gray */
-// autogenerated using string template disenumpart2.txt
-
     START_RESUME_RELIABLE (53, "Dim Gray"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Slate Blue */
-// autogenerated using string template disenumpart2.txt
-
     STOP_FREEZE_RELIABLE (54, "Slate Blue"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Olive Drab */
-// autogenerated using string template disenumpart2.txt
-
     ACKNOWLEDGE_RELIABLE (55, "Olive Drab"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Slate Gray */
-// autogenerated using string template disenumpart2.txt
-
     ACTION_REQUEST_RELIABLE (56, "Slate Gray"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light Slate Gray */
-// autogenerated using string template disenumpart2.txt
-
     ACTION_RESPONSE_RELIABLE (57, "Light Slate Gray"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium Slate Blue */
-// autogenerated using string template disenumpart2.txt
-
     DATA_QUERY_RELIABLE (58, "Medium Slate Blue"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Lawn Green */
-// autogenerated using string template disenumpart2.txt
-
     SET_DATA_RELIABLE (59, "Lawn Green"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Chartreuse */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "Chartreuse"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Aquamarine */
-// autogenerated using string template disenumpart2.txt
-
     EVENT_REPORT_RELIABLE (61, "Aquamarine"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Maroon */
-// autogenerated using string template disenumpart2.txt
-
     COMMENT_RELIABLE (62, "Maroon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Purple */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_RELIABLE (63, "Purple"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Olive */
-// autogenerated using string template disenumpart2.txt
-
     SET_RECORD_RELIABLE	 (64, "Olive"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Gray */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_QUERY_RELIABLE (65, "Gray"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Grey */
-// autogenerated using string template disenumpart2.txt
-
     GREY (66, "Grey"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sky Blue */
-// autogenerated using string template disenumpart2.txt
-
     SKY_BLUE (67, "Sky Blue"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light Sky Blue */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT_SKY_BLUE (68, "Light Sky Blue"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Blue Violet */
-// autogenerated using string template disenumpart2.txt
-
     BLUE_VIOLET (69, "Blue Violet"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dark Red */
-// autogenerated using string template disenumpart2.txt
-
     DARK_RED (70, "Dark Red"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dark Magenta */
-// autogenerated using string template disenumpart2.txt
-
     DARK_MAGENTA (71, "Dark Magenta"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Saddle Brown */
-// autogenerated using string template disenumpart2.txt
-
     SADDLE_BROWN (72, "Saddle Brown"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dark Sea Green */
-// autogenerated using string template disenumpart2.txt
-
     DARK_SEA_GREEN (73, "Dark Sea Green"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light Green */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT_GREEN (74, "Light Green"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium Purple */
-// autogenerated using string template disenumpart2.txt
-
     MEDIUM_PURPLE (75, "Medium Purple"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dark Violet */
-// autogenerated using string template disenumpart2.txt
-
     DARK_VIOLET (76, "Dark Violet"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pale Green */
-// autogenerated using string template disenumpart2.txt
-
     PALE_GREEN (77, "Pale Green"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dark Orchid */
-// autogenerated using string template disenumpart2.txt
-
     DARK_ORCHID (78, "Dark Orchid"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Yellow Green */
-// autogenerated using string template disenumpart2.txt
-
     YELLOW_GREEN (79, "Yellow Green"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sienna */
-// autogenerated using string template disenumpart2.txt
-
     SIENNA (80, "Sienna"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Brown */
-// autogenerated using string template disenumpart2.txt
-
     BROWN (81, "Brown"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dark Gray */
-// autogenerated using string template disenumpart2.txt
-
     DARK_GRAY (82, "Dark Gray"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light Blue */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT_BLUE (83, "Light Blue"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Green Yellow */
-// autogenerated using string template disenumpart2.txt
-
     GREEN_YELLOW (84, "Green Yellow"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pale Turquoise */
-// autogenerated using string template disenumpart2.txt
-
     PALE_TURQUOISE (85, "Pale Turquoise"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light Steel Blue */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT_STEEL_BLUE (86, "Light Steel Blue"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Powder Blue */
-// autogenerated using string template disenumpart2.txt
-
     POWDER_BLUE (87, "Powder Blue"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fire Brick */
-// autogenerated using string template disenumpart2.txt
-
     FIRE_BRICK (88, "Fire Brick"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dark Golden Rod */
-// autogenerated using string template disenumpart2.txt
-
     DARK_GOLDEN_ROD (89, "Dark Golden Rod"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium Orchid */
-// autogenerated using string template disenumpart2.txt
-
     MEDIUM_ORCHID (90, "Medium Orchid"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Rosy Brown */
-// autogenerated using string template disenumpart2.txt
-
     ROSY_BROWN (91, "Rosy Brown"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dark Khaki */
-// autogenerated using string template disenumpart2.txt
-
     DARK_KHAKI (92, "Dark Khaki"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Silver */
-// autogenerated using string template disenumpart2.txt
-
     SILVER (93, "Silver"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium Violet Red */
-// autogenerated using string template disenumpart2.txt
-
     MEDIUM_VIOLET_RED (94, "Medium Violet Red"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Indian Red */
-// autogenerated using string template disenumpart2.txt
-
     INDIAN_RED (95, "Indian Red"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Peru */
-// autogenerated using string template disenumpart2.txt
-
     PERU (96, "Peru"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Chocolate */
-// autogenerated using string template disenumpart2.txt
-
     CHOCOLATE (97, "Chocolate"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tan */
-// autogenerated using string template disenumpart2.txt
-
     TAN (98, "Tan"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light Gray */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT_GRAY (99, "Light Gray"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pale Violet Red */
-// autogenerated using string template disenumpart2.txt
-
     PALE_VIOLET_RED (100, "Pale Violet Red"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Thistle */
-// autogenerated using string template disenumpart2.txt
-
     THISTLE (101, "Thistle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Orchid */
-// autogenerated using string template disenumpart2.txt
-
     ORCHID (102, "Orchid"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Golden Rod */
-// autogenerated using string template disenumpart2.txt
-
     GOLDEN_ROD (103, "Golden Rod"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Crimson */
-// autogenerated using string template disenumpart2.txt
-
     CRIMSON (104, "Crimson"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Gainsboro */
-// autogenerated using string template disenumpart2.txt
-
     GAINSBORO (105, "Gainsboro"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Plum */
-// autogenerated using string template disenumpart2.txt
-
     PLUM (106, "Plum"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Burly Wood */
-// autogenerated using string template disenumpart2.txt
-
     BURLY_WOOD (107, "Burly Wood"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light Cyan */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT_CYAN (108, "Light Cyan"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Lavender */
-// autogenerated using string template disenumpart2.txt
-
     LAVENDER (109, "Lavender"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dark Salmon */
-// autogenerated using string template disenumpart2.txt
-
     DARK_SALMON (110, "Dark Salmon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Violet */
-// autogenerated using string template disenumpart2.txt
-
     VIOLET (111, "Violet"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pale Golden Rod */
-// autogenerated using string template disenumpart2.txt
-
     PALE_GOLDEN_ROD (112, "Pale Golden Rod"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light Coral */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT_CORAL (113, "Light Coral"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Khaki */
-// autogenerated using string template disenumpart2.txt
-
     KHAKI (114, "Khaki"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Alice Blue */
-// autogenerated using string template disenumpart2.txt
-
     ALICE_BLUE (115, "Alice Blue"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Honey Dew */
-// autogenerated using string template disenumpart2.txt
-
     HONEY_DEW (116, "Honey Dew"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Azure */
-// autogenerated using string template disenumpart2.txt
-
     AZURE (117, "Azure"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sandy Brown */
-// autogenerated using string template disenumpart2.txt
-
     SANDY_BROWN (118, "Sandy Brown"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Wheat */
-// autogenerated using string template disenumpart2.txt
-
     WHEAT (119, "Wheat"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Beige */
-// autogenerated using string template disenumpart2.txt
-
     BEIGE (120, "Beige"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** White Smoke */
-// autogenerated using string template disenumpart2.txt
-
     WHITE_SMOKE (121, "White Smoke"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mint Cream */
-// autogenerated using string template disenumpart2.txt
-
     MINT_CREAM (122, "Mint Cream"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ghost White */
-// autogenerated using string template disenumpart2.txt
-
     GHOST_WHITE (123, "Ghost White"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Salmon */
-// autogenerated using string template disenumpart2.txt
-
     SALMON (124, "Salmon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Antique White */
-// autogenerated using string template disenumpart2.txt
-
     ANTIQUE_WHITE (125, "Antique White"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Linen */
-// autogenerated using string template disenumpart2.txt
-
     LINEN (126, "Linen"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light Golden Rod Yellow */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT_GOLDEN_ROD_YELLOW (127, "Light Golden Rod Yellow"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Old Lace */
-// autogenerated using string template disenumpart2.txt
-
     OLD_LACE (128, "Old Lace"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Red */
-// autogenerated using string template disenumpart2.txt
-
     RED (129, "Red"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fuchsia */
-// autogenerated using string template disenumpart2.txt
-
     FUCHSIA (130, "Fuchsia"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Magenta */
-// autogenerated using string template disenumpart2.txt
-
     MAGENTA (131, "Magenta"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Deep Pink */
-// autogenerated using string template disenumpart2.txt
-
     DEEP_PINK (132, "Deep Pink"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Orange Red */
-// autogenerated using string template disenumpart2.txt
-
     ORANGE_RED (133, "Orange Red"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tomato */
-// autogenerated using string template disenumpart2.txt
-
     TOMATO (134, "Tomato"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hot Pink */
-// autogenerated using string template disenumpart2.txt
-
     HOT_PINK (135, "Hot Pink"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Coral */
-// autogenerated using string template disenumpart2.txt
-
     CORAL (136, "Coral"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dark Orange */
-// autogenerated using string template disenumpart2.txt
-
     DARK_ORANGE (137, "Dark Orange"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light Salmon */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT_SALMON (138, "Light Salmon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Orange */
-// autogenerated using string template disenumpart2.txt
-
     ORANGE (139, "Orange"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light Pink */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT_PINK (140, "Light Pink"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pink */
-// autogenerated using string template disenumpart2.txt
-
     PINK (141, "Pink"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Gold */
-// autogenerated using string template disenumpart2.txt
-
     GOLD (142, "Gold"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Peach Puff */
-// autogenerated using string template disenumpart2.txt
-
     PEACH_PUFF (143, "Peach Puff"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Navajo White */
-// autogenerated using string template disenumpart2.txt
-
     NAVAJO_WHITE (144, "Navajo White"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Moccasin */
-// autogenerated using string template disenumpart2.txt
-
     MOCCASIN (145, "Moccasin"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bisque */
-// autogenerated using string template disenumpart2.txt
-
     BISQUE (146, "Bisque"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Misty Rose */
-// autogenerated using string template disenumpart2.txt
-
     MISTY_ROSE (147, "Misty Rose"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Blanched Almond */
-// autogenerated using string template disenumpart2.txt
-
     BLANCHED_ALMOND (148, "Blanched Almond"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Papaya Whip */
-// autogenerated using string template disenumpart2.txt
-
     PAPAYA_WHIP (149, "Papaya Whip"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Lavender Blush */
-// autogenerated using string template disenumpart2.txt
-
     LAVENDER_BLUSH (150, "Lavender Blush"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sea Shell */
-// autogenerated using string template disenumpart2.txt
-
     SEA_SHELL (151, "Sea Shell"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cornsilk */
-// autogenerated using string template disenumpart2.txt
-
     CORNSILK (152, "Cornsilk"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Lemon Chiffon */
-// autogenerated using string template disenumpart2.txt
-
     LEMON_CHIFFON (153, "Lemon Chiffon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Floral White */
-// autogenerated using string template disenumpart2.txt
-
     FLORAL_WHITE (154, "Floral White"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Snow */
-// autogenerated using string template disenumpart2.txt
-
     SNOW (155, "Snow"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Yellow */
-// autogenerated using string template disenumpart2.txt
-
     YELLOW (156, "Yellow"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light Yellow */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT_YELLOW (157, "Light Yellow"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ivory */
-// autogenerated using string template disenumpart2.txt
-
     IVORY (158, "Ivory"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** White */
-// autogenerated using string template disenumpart2.txt
-
-    WHITE (159, "White"),;
-
-// autogenerated using string template disenumpart25.txt
+    WHITE (159, "White");
 
     private int value;
     private final String description;
@@ -1029,8 +385,6 @@ public enum Color
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSmoke.java b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSmoke.java
index 2645a2cf6dbe60d03a2cfc27e3907f3b1cd63896..ba49eb53c04d46d29247f3ec6fabb7528f446d2a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSmoke.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSmoke.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 375,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 375 marshal size 2<br>
  * ComponentVisualDamageStatusSmoke
  */
 public enum ComponentVisualDamageStatusSmoke 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Smoke */
-// autogenerated using string template disenumpart2.txt
-
     NO_SMOKE (0, "No Smoke"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light Smoke */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT_SMOKE (1, "Light Smoke"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Moderate Smoke */
-// autogenerated using string template disenumpart2.txt
-
     MODERATE_SMOKE (2, "Moderate Smoke"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Heavy Smoke */
-// autogenerated using string template disenumpart2.txt
-
-    HEAVY_SMOKE (3, "Heavy Smoke"),;
-
-// autogenerated using string template disenumpart25.txt
+    HEAVY_SMOKE (3, "Heavy Smoke");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum ComponentVisualDamageStatusSmoke
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSurfaceDamage.java b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSurfaceDamage.java
index baed6e9af15b9e827254d0a0d3b3805d9a8ec750..8f496aaf20d87a9ee53438207ebc44da34577ad7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSurfaceDamage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSurfaceDamage.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 376,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 376 marshal size 2<br>
  * ComponentVisualDamageStatusSurfaceDamage
  */
 public enum ComponentVisualDamageStatusSurfaceDamage 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Normal Appearance */
-// autogenerated using string template disenumpart2.txt
-
     NORMAL_APPEARANCE (0, "Normal Appearance"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light Charring */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT_CHARRING (1, "Light Charring"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Heavy Charring */
-// autogenerated using string template disenumpart2.txt
-
     HEAVY_CHARRING (2, "Heavy Charring"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** One or More Holes Burned Completely through Surface */
-// autogenerated using string template disenumpart2.txt
-
-    ONE_OR_MORE_HOLES_BURNED_COMPLETELY_THROUGH_SURFACE (3, "One or More Holes Burned Completely through Surface"),;
-
-// autogenerated using string template disenumpart25.txt
+    ONE_OR_MORE_HOLES_BURNED_COMPLETELY_THROUGH_SURFACE (3, "One or More Holes Burned Completely through Surface");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum ComponentVisualDamageStatusSurfaceDamage
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CoverShroudStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/CoverShroudStatus.java
index 4d605236ef5d0ebbdb4e9bfce33ba9fd220516fe..ce9ff811cd2a2eafa722a3696f9466e6688d6661 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CoverShroudStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CoverShroudStatus.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 426,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 426 marshal size 2<br>
  * CoverShroudStatus
  */
 public enum CoverShroudStatus 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Closed */
-// autogenerated using string template disenumpart2.txt
-
     CLOSED (0, "Closed"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Opening */
-// autogenerated using string template disenumpart2.txt
-
     OPENING (1, "Opening"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cover/Shroud Blown/Detached */
-// autogenerated using string template disenumpart2.txt
-
     COVER_SHROUD_BLOWN_DETACHED (2, "Cover/Shroud Blown/Detached"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Open/Attached */
-// autogenerated using string template disenumpart2.txt
-
-    OPEN_ATTACHED (3, "Open/Attached"),;
-
-// autogenerated using string template disenumpart25.txt
+    OPEN_ATTACHED (3, "Open/Attached");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum CoverShroudStatus
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CryptoKeyIDCryptoMode.java b/src-generated/edu/nps/moves/dis7/enumerations/CryptoKeyIDCryptoMode.java
index 7ed848cf03bde64f7be795b2f5dae44e9cd216f1..5a6f3ba60c2b6cad85c1dd1f3d968e377b7d7130 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CryptoKeyIDCryptoMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CryptoKeyIDCryptoMode.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 449,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 449 marshal size 1<br>
  * CryptoKeyIDCryptoMode
  */
 public enum CryptoKeyIDCryptoMode 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Baseband */
-// autogenerated using string template disenumpart2.txt
-
     BASEBAND (0, "Baseband"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Diphase */
-// autogenerated using string template disenumpart2.txt
-
-    DIPHASE (1, "Diphase"),;
-
-// autogenerated using string template disenumpart25.txt
+    DIPHASE (1, "Diphase");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum CryptoKeyIDCryptoMode
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentDamageStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentDamageStatus.java
index a82d08b007c825aaadf4395bf5ea854da3c9e8a0..27b45dab8552b7e53803dd3c66a448445e4e737e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentDamageStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentDamageStatus.java
@@ -7,48 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 315,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 315 marshal size 8<br>
  * DEDamageDescriptionComponentDamageStatus
  */
 public enum DEDamageDescriptionComponentDamageStatus 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Damage */
-// autogenerated using string template disenumpart2.txt
-
     NO_DAMAGE (0, "No Damage"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Minor Damage */
-// autogenerated using string template disenumpart2.txt
-
     MINOR_DAMAGE (1, "Minor Damage"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium Damage */
-// autogenerated using string template disenumpart2.txt
-
     MEDIUM_DAMAGE (2, "Medium Damage"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Major Damage */
-// autogenerated using string template disenumpart2.txt
-
     MAJOR_DAMAGE (3, "Major Damage"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Destroyed */
-// autogenerated using string template disenumpart2.txt
-
-    DESTROYED (4, "Destroyed"),;
-
-// autogenerated using string template disenumpart25.txt
+    DESTROYED (4, "Destroyed");
 
     private int value;
     private final String description;
@@ -98,8 +73,6 @@ public enum DEDamageDescriptionComponentDamageStatus
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java
index 2c89362f529dc7eb4032b4226a9a6a077ff6972a..a85ce6568d78128d9731e9d1028c60649a37b741 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 316,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 316 marshal size 8<br>
  * DEDamageDescriptionComponentVisualSmokeColor
  */
 public enum DEDamageDescriptionComponentVisualSmokeColor 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Smoke */
-// autogenerated using string template disenumpart2.txt
-
     NO_SMOKE (0, "No Smoke"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** White */
-// autogenerated using string template disenumpart2.txt
-
     WHITE (1, "White"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Gray */
-// autogenerated using string template disenumpart2.txt
-
     GRAY (2, "Gray"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Black */
-// autogenerated using string template disenumpart2.txt
-
-    BLACK (3, "Black"),;
-
-// autogenerated using string template disenumpart25.txt
+    BLACK (3, "Black");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum DEDamageDescriptionComponentVisualSmokeColor
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlagsStateUpdateFlag.java b/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlagsStateUpdateFlag.java
index a0339653d29adcd603ca63080e7412393b62327c..2e25e2c49b3f15d57c2d7a73d5ed1e9b3df3332c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlagsStateUpdateFlag.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlagsStateUpdateFlag.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 374,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 374 marshal size 1<br>
  * DEFireFlagsStateUpdateFlag
  */
 public enum DEFireFlagsStateUpdateFlag 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Update Due to Heartbeat Timer */
-// autogenerated using string template disenumpart2.txt
-
     UPDATE_DUE_TO_HEARTBEAT_TIMER (0, "Update Due to Heartbeat Timer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** State Change */
-// autogenerated using string template disenumpart2.txt
-
-    STATE_CHANGE (1, "State Change"),;
-
-// autogenerated using string template disenumpart25.txt
+    STATE_CHANGE (1, "State Change");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum DEFireFlagsStateUpdateFlag
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEFirePulseShape.java b/src-generated/edu/nps/moves/dis7/enumerations/DEFirePulseShape.java
index 044069b8f4d46a3f721fff57b71bae27a5bdc572..619940a875cb460ea363d2d0d50f8f382ec5d10d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEFirePulseShape.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEFirePulseShape.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 312,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 312 marshal size 8<br>
  * DEFirePulseShape
  */
 public enum DEFirePulseShape 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Square Wave */
-// autogenerated using string template disenumpart2.txt
-
     SQUARE_WAVE (1, "Square Wave"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Continuous Wave */
-// autogenerated using string template disenumpart2.txt
-
     CONTINUOUS_WAVE (2, "Continuous Wave"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Gaussian */
-// autogenerated using string template disenumpart2.txt
-
-    GAUSSIAN (3, "Gaussian"),;
-
-// autogenerated using string template disenumpart25.txt
+    GAUSSIAN (3, "Gaussian");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum DEFirePulseShape
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEPrecisionAimpointBeamSpotType.java b/src-generated/edu/nps/moves/dis7/enumerations/DEPrecisionAimpointBeamSpotType.java
index 7eea6228156ba9820647ffcd6dcce247a6008ff3..32395a87ab4e364b625ff4604205a31d8bbe3222 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEPrecisionAimpointBeamSpotType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEPrecisionAimpointBeamSpotType.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 311,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 311 marshal size 8<br>
  * DEPrecisionAimpointBeamSpotType
  */
 public enum DEPrecisionAimpointBeamSpotType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Gaussian */
-// autogenerated using string template disenumpart2.txt
-
     GAUSSIAN (1, "Gaussian"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Top Hat */
-// autogenerated using string template disenumpart2.txt
-
-    TOP_HAT (2, "Top Hat"),;
-
-// autogenerated using string template disenumpart25.txt
+    TOP_HAT (2, "Top Hat");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum DEPrecisionAimpointBeamSpotType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISAttributeActionCode.java b/src-generated/edu/nps/moves/dis7/enumerations/DISAttributeActionCode.java
index 2b8d9185c3eb772145614adb341af30293a1ca6d..7bd7407c961746a4efc793f4bb0efba8e7767509 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISAttributeActionCode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISAttributeActionCode.java
@@ -7,24 +7,15 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 295,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 295 marshal size 8<br>
  * DISAttributeActionCode
  */
 public enum DISAttributeActionCode 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
-    NO_STATEMENT (0, "No Statement"),;
-
-// autogenerated using string template disenumpart25.txt
+    NO_STATEMENT (0, "No Statement");
 
     private int value;
     private final String description;
@@ -74,8 +65,6 @@ public enum DISAttributeActionCode
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISLiveEntitySubprotocolNumber.java b/src-generated/edu/nps/moves/dis7/enumerations/DISLiveEntitySubprotocolNumber.java
index e937ddedb8b8362385f123b33f2af9dbdde0d861..363f7e94e8576b10245b946bbfc328ef2da376e7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISLiveEntitySubprotocolNumber.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISLiveEntitySubprotocolNumber.java
@@ -7,24 +7,15 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 417,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 417 marshal size 8<br>
  * DISLiveEntitySubprotocolNumber
  */
 public enum DISLiveEntitySubprotocolNumber 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Subprotocol */
-// autogenerated using string template disenumpart2.txt
-
-    NO_SUBPROTOCOL (0, "No Subprotocol"),;
-
-// autogenerated using string template disenumpart25.txt
+    NO_SUBPROTOCOL (0, "No Subprotocol");
 
     private int value;
     private final String description;
@@ -74,8 +65,6 @@ public enum DISLiveEntitySubprotocolNumber
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java
index d9b6bf44d72f2de92e01e88fff9d22c599610c0b..d07fbfff4fc14ed4ec50140d070fd70b0958c01c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 389,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 389 marshal size 1<br>
  * DISPDUStatusActiveInterrogationIndicator(AII)
  */
 public enum DISPDUStatusActiveInterrogationIndicatorAII 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Active */
-// autogenerated using string template disenumpart2.txt
-
     NOT_ACTIVE (0, "Not Active"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Active */
-// autogenerated using string template disenumpart2.txt
-
-    ACTIVE (1, "Active"),;
-
-// autogenerated using string template disenumpart25.txt
+    ACTIVE (1, "Active");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum DISPDUStatusActiveInterrogationIndicatorAII
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java
index 2ea0a2cf8d33d4301fbe23ca471e603c8c9275bc..ac2590e94d18292dc06397978e142dadeaf346a5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 303,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 303 marshal size 1<br>
  * DISPDUStatusCoupledExtensionIndicator(CEI)
  */
 public enum DISPDUStatusCoupledExtensionIndicatorCEI 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Coupled */
-// autogenerated using string template disenumpart2.txt
-
     NOT_COUPLED (0, "Not Coupled"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Coupled */
-// autogenerated using string template disenumpart2.txt
-
-    COUPLED (1, "Coupled"),;
-
-// autogenerated using string template disenumpart25.txt
+    COUPLED (1, "Coupled");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum DISPDUStatusCoupledExtensionIndicatorCEI
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java
index c84557ba397cae598faa1d066e0dcf803a3a5af3..c630a3844944900e970d074a8388c99a16be926f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 305,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 305 marshal size 2<br>
  * DISPDUStatusDetonationTypeIndicator(DTI)
  */
 public enum DISPDUStatusDetonationTypeIndicatorDTI 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Munition */
-// autogenerated using string template disenumpart2.txt
-
     MUNITION (0, "Munition"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Expendable */
-// autogenerated using string template disenumpart2.txt
-
     EXPENDABLE (1, "Expendable"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Non-munition Explosion */
-// autogenerated using string template disenumpart2.txt
-
-    NON_MUNITION_EXPLOSION (2, "Non-munition Explosion"),;
-
-// autogenerated using string template disenumpart25.txt
+    NON_MUNITION_EXPLOSION (2, "Non-munition Explosion");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum DISPDUStatusDetonationTypeIndicatorDTI
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusFireTypeIndicatorFTI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusFireTypeIndicatorFTI.java
index 6764675cc686aea376453a17e6182dd96ce2aafd..16166c413a707ba87451ae8c7736356e785fdb64 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusFireTypeIndicatorFTI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusFireTypeIndicatorFTI.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 304,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 304 marshal size 1<br>
  * DISPDUStatusFireTypeIndicator(FTI)
  */
 public enum DISPDUStatusFireTypeIndicatorFTI 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Munition */
-// autogenerated using string template disenumpart2.txt
-
     MUNITION (0, "Munition"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Expendable */
-// autogenerated using string template disenumpart2.txt
-
-    EXPENDABLE (1, "Expendable"),;
-
-// autogenerated using string template disenumpart25.txt
+    EXPENDABLE (1, "Expendable");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum DISPDUStatusFireTypeIndicatorFTI
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIFFSimulationModeISM.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIFFSimulationModeISM.java
index c7130d0bf08f7c92ebbff4d5a8c0c3616fc96958..c46f57a3201607b9469de0917b9247fa9e4f8882 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIFFSimulationModeISM.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIFFSimulationModeISM.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 308,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 308 marshal size 1<br>
  * DISPDUStatusIFFSimulationMode(ISM)
  */
 public enum DISPDUStatusIFFSimulationModeISM 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Regeneration */
-// autogenerated using string template disenumpart2.txt
-
     REGENERATION (0, "Regeneration"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Interactive */
-// autogenerated using string template disenumpart2.txt
-
-    INTERACTIVE (1, "Interactive"),;
-
-// autogenerated using string template disenumpart25.txt
+    INTERACTIVE (1, "Interactive");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum DISPDUStatusIFFSimulationModeISM
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java
index 92860149b3a0d56850b26db5c2ef26f176532193..115f72bd74582ef981022cf3a02b9e0c775d2167 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 307,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 307 marshal size 2<br>
  * DISPDUStatusIntercomAttachedIndicator(IAI)
  */
 public enum DISPDUStatusIntercomAttachedIndicatorIAI 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Unattached */
-// autogenerated using string template disenumpart2.txt
-
     UNATTACHED (1, "Unattached"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Attached */
-// autogenerated using string template disenumpart2.txt
-
-    ATTACHED (2, "Attached"),;
-
-// autogenerated using string template disenumpart25.txt
+    ATTACHED (2, "Attached");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum DISPDUStatusIntercomAttachedIndicatorIAI
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusLVCIndicatorLVC.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusLVCIndicatorLVC.java
index e78c5b6730a8a726d314633e73fa5de817a39945..99f70f1765a6f84492e6bf43e0937c3d3d17cd86 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusLVCIndicatorLVC.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusLVCIndicatorLVC.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 302,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 302 marshal size 2<br>
  * DISPDUStatusLVCIndicator(LVC)
  */
 public enum DISPDUStatusLVCIndicatorLVC 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Live */
-// autogenerated using string template disenumpart2.txt
-
     LIVE (1, "Live"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Virtual */
-// autogenerated using string template disenumpart2.txt
-
     VIRTUAL (2, "Virtual"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Constructive */
-// autogenerated using string template disenumpart2.txt
-
-    CONSTRUCTIVE (3, "Constructive"),;
-
-// autogenerated using string template disenumpart25.txt
+    CONSTRUCTIVE (3, "Constructive");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum DISPDUStatusLVCIndicatorLVC
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java
index ae45755e6526749ad9767684716b0ae602884fff..01608799745b3877c985b2c439f5d063d4eb8c9e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 306,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 306 marshal size 2<br>
  * DISPDUStatusRadioAttachedIndicator(RAI)
  */
 public enum DISPDUStatusRadioAttachedIndicatorRAI 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Unattached */
-// autogenerated using string template disenumpart2.txt
-
     UNATTACHED (1, "Unattached"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Attached */
-// autogenerated using string template disenumpart2.txt
-
-    ATTACHED (2, "Attached"),;
-
-// autogenerated using string template disenumpart25.txt
+    ATTACHED (2, "Attached");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum DISPDUStatusRadioAttachedIndicatorRAI
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java
index af74afffebcf50f8f2954a7e59e976a8622b8c8e..dd5d9b6a1cd9f71c7421e695e55dc1111fe2558d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 301,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 301 marshal size 1<br>
  * DISPDUStatusTransferredEntityIndicator(TEI)
  */
 public enum DISPDUStatusTransferredEntityIndicatorTEI 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Difference */
-// autogenerated using string template disenumpart2.txt
-
     NO_DIFFERENCE (0, "No Difference"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Difference */
-// autogenerated using string template disenumpart2.txt
-
-    DIFFERENCE (1, "Difference"),;
-
-// autogenerated using string template disenumpart25.txt
+    DIFFERENCE (1, "Difference");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum DISPDUStatusTransferredEntityIndicatorTEI
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolFamily.java b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolFamily.java
index cf39a5f8b167c5de0922e4e00a6793c00235cf43..db6173a3299ffec209e71e5653a7dac4e03df8e5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolFamily.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolFamily.java
@@ -7,102 +7,41 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 5,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 5 marshal size 8<br>
  * DISProtocolFamily
  */
 public enum DISProtocolFamily 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Entity Information/Interaction */
-// autogenerated using string template disenumpart2.txt
-
     ENTITY_INFORMATION_INTERACTION (1, "Entity Information/Interaction"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Warfare */
-// autogenerated using string template disenumpart2.txt
-
     WARFARE (2, "Warfare"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Logistics */
-// autogenerated using string template disenumpart2.txt
-
     LOGISTICS (3, "Logistics"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Radio Communications */
-// autogenerated using string template disenumpart2.txt
-
     RADIO_COMMUNICATIONS (4, "Radio Communications"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Simulation Management */
-// autogenerated using string template disenumpart2.txt
-
     SIMULATION_MANAGEMENT (5, "Simulation Management"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Distributed Emission Regeneration */
-// autogenerated using string template disenumpart2.txt
-
     DISTRIBUTED_EMISSION_REGENERATION (6, "Distributed Emission Regeneration"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Entity Management */
-// autogenerated using string template disenumpart2.txt
-
     ENTITY_MANAGEMENT (7, "Entity Management"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Minefield */
-// autogenerated using string template disenumpart2.txt
-
     MINEFIELD (8, "Minefield"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Synthetic Environment */
-// autogenerated using string template disenumpart2.txt
-
     SYNTHETIC_ENVIRONMENT (9, "Synthetic Environment"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Simulation Management with Reliability */
-// autogenerated using string template disenumpart2.txt
-
     SIMULATION_MANAGEMENT_WITH_RELIABILITY (10, "Simulation Management with Reliability"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Live Entity (LE) Information/Interaction */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_LE_INFORMATION_INTERACTION (11, "Live Entity (LE) Information/Interaction"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Non-Real-Time */
-// autogenerated using string template disenumpart2.txt
-
     NON_REAL_TIME (12, "Non-Real-Time"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Information Operations */
-// autogenerated using string template disenumpart2.txt
-
-    INFORMATION_OPERATIONS (13, "Information Operations"),;
-
-// autogenerated using string template disenumpart25.txt
+    INFORMATION_OPERATIONS (13, "Information Operations");
 
     private int value;
     private final String description;
@@ -152,8 +91,6 @@ public enum DISProtocolFamily
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolVersion.java b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolVersion.java
index af2256921279bec62d8d695186def4b7982840a1..bf750d7f681a88fa3b1d65a1e26513ca5ca2f584 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolVersion.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolVersion.java
@@ -7,66 +7,29 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 3,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 3 marshal size 8<br>
  * DISProtocolVersion
  */
 public enum DISProtocolVersion 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** DIS PDU version 1.0 (May 92) */
-// autogenerated using string template disenumpart2.txt
-
     DIS_PDU_VERSION_10_MAY_92 (1, "DIS PDU version 1.0 (May 92)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** IEEE 1278-1993 */
-// autogenerated using string template disenumpart2.txt
-
     IEEE_1278_1993 (2, "IEEE 1278-1993"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** DIS Applications Version 2.0 - Third Draft (28 May 1993), IST-CR-93-15 */
-// autogenerated using string template disenumpart2.txt
-
     DIS_APPLICATIONS_VERSION_20_THIRD_DRAFT_28_MAY_1993 (3, "DIS Applications Version 2.0 - Third Draft (28 May 1993)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** DIS Application Protocols Version 2.0 - Fourth Draft (Revised) (16 March 1994), IST-CR-94-50 */
-// autogenerated using string template disenumpart2.txt
-
     DIS_APPLICATION_PROTOCOLS_VERSION_20_FOURTH_DRAFT_REVISED_16_MARCH_1994 (4, "DIS Application Protocols Version 2.0 - Fourth Draft (Revised) (16 March 1994)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** IEEE 1278.1-1995 */
-// autogenerated using string template disenumpart2.txt
-
     IEEE_12781_1995 (5, "IEEE 1278.1-1995"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** IEEE 1278.1A-1998 */
-// autogenerated using string template disenumpart2.txt
-
     IEEE_12781A_1998 (6, "IEEE 1278.1A-1998"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** IEEE 1278.1-2012 */
-// autogenerated using string template disenumpart2.txt
-
-    IEEE_12781_2012 (7, "IEEE 1278.1-2012"),;
-
-// autogenerated using string template disenumpart25.txt
+    IEEE_12781_2012 (7, "IEEE 1278.1-2012");
 
     private int value;
     private final String description;
@@ -116,8 +79,6 @@ public enum DISProtocolVersion
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DRParametersType.java b/src-generated/edu/nps/moves/dis7/enumerations/DRParametersType.java
index 68efcd34c0887443a284e92001528c14406ca267..056d1a1201ef358636ff272aef6408a0e890ebd2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DRParametersType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DRParametersType.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 296,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 296 marshal size 8<br>
  * DRParametersType
  */
 public enum DRParametersType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** None */
-// autogenerated using string template disenumpart2.txt
-
     NONE (0, "None"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Local Euler Angles (Yaw, Pitch, Roll) */
-// autogenerated using string template disenumpart2.txt
-
     LOCAL_EULER_ANGLES_YAW_PITCH_ROLL (1, "Local Euler Angles (Yaw, Pitch, Roll)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** World Orientation Quaternion */
-// autogenerated using string template disenumpart2.txt
-
-    WORLD_ORIENTATION_QUATERNION (2, "World Orientation Quaternion"),;
-
-// autogenerated using string template disenumpart25.txt
+    WORLD_ORIENTATION_QUATERNION (2, "World Orientation Quaternion");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum DRParametersType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DataCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/DataCategory.java
index af58702ec06d2196e2e1058b9c7dbd11093b2b7b..8e3441c6263eea32354c8d2a8881da005b2e54fa 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DataCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DataCategory.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 369,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 369 marshal size 8<br>
  * DataCategory
  */
 public enum DataCategory 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Functional Data */
-// autogenerated using string template disenumpart2.txt
-
     FUNCTIONAL_DATA (1, "Functional Data"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Transponder/Interrogator Data Link Messages */
-// autogenerated using string template disenumpart2.txt
-
-    TRANSPONDER_INTERROGATOR_DATA_LINK_MESSAGES (2, "Transponder/Interrogator Data Link Messages"),;
-
-// autogenerated using string template disenumpart25.txt
+    TRANSPONDER_INTERROGATOR_DATA_LINK_MESSAGES (2, "Transponder/Interrogator Data Link Messages");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum DataCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DeadReckoningAlgorithm.java b/src-generated/edu/nps/moves/dis7/enumerations/DeadReckoningAlgorithm.java
index 68ed18c03687fca1aa765f6943b590dafd3dbb13..cc4202cc74eebf352c3068e5404f53a970b30b06 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DeadReckoningAlgorithm.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DeadReckoningAlgorithm.java
@@ -7,78 +7,33 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 44,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 44 marshal size 8<br>
  * DeadReckoningAlgorithm
  */
 public enum DeadReckoningAlgorithm 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Static - Non-moving Entity */
-// autogenerated using string template disenumpart2.txt
-
     STATIC_NON_MOVING_ENTITY (1, "Static - Non-moving Entity"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** DRM (FPW) - Constant Velocity / Low Acceleration Linear Motion Entity */
-// autogenerated using string template disenumpart2.txt
-
     DRM_FPW_CONSTANT_VELOCITY_LOW_ACCELERATION_LINEAR_MOTION_ENTITY (2, "DRM (FPW) - Constant Velocity / Low Acceleration Linear Motion Entity"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** DRM (RPW) - Constant Velocity / Low Acceleration Linear Motion Entity with Extrapolation of Orientation */
-// autogenerated using string template disenumpart2.txt
-
     DRM_RPW_CONSTANT_VELOCITY_LOW_ACCELERATION_LINEAR_MOTION_ENTITY_WITH_EXTRAPOLATION_OF_ORIENTATION (3, "DRM (RPW) - Constant Velocity / Low Acceleration Linear Motion Entity with Extrapolation of Orientation"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** DRM (RVW) - High Speed or Maneuvering Entity with Extrapolation of Orientation */
-// autogenerated using string template disenumpart2.txt
-
     DRM_RVW_HIGH_SPEED_OR_MANEUVERING_ENTITY_WITH_EXTRAPOLATION_OF_ORIENTATION (4, "DRM (RVW) - High Speed or Maneuvering Entity with Extrapolation of Orientation"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** DRM (FVW) - High Speed or Maneuvering Entity */
-// autogenerated using string template disenumpart2.txt
-
     DRM_FVW_HIGH_SPEED_OR_MANEUVERING_ENTITY (5, "DRM (FVW) - High Speed or Maneuvering Entity"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** DRM (FPB) - Similar to FPW except in Body Coordinates */
-// autogenerated using string template disenumpart2.txt
-
     DRM_FPB_SIMILAR_TO_FPW_EXCEPT_IN_BODY_COORDINATES (6, "DRM (FPB) - Similar to FPW except in Body Coordinates"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** DRM (RPB) - Similar to RPW except in Body Coordinates */
-// autogenerated using string template disenumpart2.txt
-
     DRM_RPB_SIMILAR_TO_RPW_EXCEPT_IN_BODY_COORDINATES (7, "DRM (RPB) - Similar to RPW except in Body Coordinates"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** DRM (RVB) - Similar to RVW except in Body Coordinates */
-// autogenerated using string template disenumpart2.txt
-
     DRM_RVB_SIMILAR_TO_RVW_EXCEPT_IN_BODY_COORDINATES (8, "DRM (RVB) - Similar to RVW except in Body Coordinates"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** DRM (FVB) - Similar to FVW except in Body Coordinates */
-// autogenerated using string template disenumpart2.txt
-
-    DRM_FVB_SIMILAR_TO_FVW_EXCEPT_IN_BODY_COORDINATES (9, "DRM (FVB) - Similar to FVW except in Body Coordinates"),;
-
-// autogenerated using string template disenumpart25.txt
+    DRM_FVB_SIMILAR_TO_FVW_EXCEPT_IN_BODY_COORDINATES (9, "DRM (FVB) - Similar to FVW except in Body Coordinates");
 
     private int value;
     private final String description;
@@ -128,8 +83,6 @@ public enum DeadReckoningAlgorithm
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java
index 50d83e35d4022bf1df6d36886caf673d4311ebfe..e6557b8cf0e6264a84b2da05ce957f3c69639b4a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 362,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 362 marshal size 1<br>
  * DeltaMode5SAltitudePositiveNegativeIndicator
  */
 public enum DeltaMode5SAltitudePositiveNegativeIndicator 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Positive */
-// autogenerated using string template disenumpart2.txt
-
     POSITIVE (0, "Positive"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Negative */
-// autogenerated using string template disenumpart2.txt
-
-    NEGATIVE (1, "Negative"),;
-
-// autogenerated using string template disenumpart25.txt
+    NEGATIVE (1, "Negative");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum DeltaMode5SAltitudePositiveNegativeIndicator
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DetonationResult.java b/src-generated/edu/nps/moves/dis7/enumerations/DetonationResult.java
index 8c59a805970a84d12e85806ed860d3dca69dee73..359c19be19d307a25ae17fb719384a7d2eeb7a5e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DetonationResult.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DetonationResult.java
@@ -7,222 +7,81 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 62,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 62 marshal size 8<br>
  * DetonationResult
  */
 public enum DetonationResult 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Entity Impact */
-// autogenerated using string template disenumpart2.txt
-
     ENTITY_IMPACT (1, "Entity Impact"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Entity Proximate Detonation */
-// autogenerated using string template disenumpart2.txt
-
     ENTITY_PROXIMATE_DETONATION (2, "Entity Proximate Detonation"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ground Impact */
-// autogenerated using string template disenumpart2.txt
-
     GROUND_IMPACT (3, "Ground Impact"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ground Proximate Detonation */
-// autogenerated using string template disenumpart2.txt
-
     GROUND_PROXIMATE_DETONATION (4, "Ground Proximate Detonation"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Detonation */
-// autogenerated using string template disenumpart2.txt
-
     DETONATION (5, "Detonation"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** None or No Detonation (Dud) */
-// autogenerated using string template disenumpart2.txt
-
     NONE_OR_NO_DETONATION_DUD (6, "None or No Detonation (Dud)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** HE hit, small */
-// autogenerated using string template disenumpart2.txt
-
     HE_HIT_SMALL (7, "HE hit, small"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** HE hit, medium */
-// autogenerated using string template disenumpart2.txt
-
     HE_HIT_MEDIUM (8, "HE hit, medium"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** HE hit, large */
-// autogenerated using string template disenumpart2.txt
-
     HE_HIT_LARGE (9, "HE hit, large"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Armor-piercing hit */
-// autogenerated using string template disenumpart2.txt
-
     ARMOR_PIERCING_HIT (10, "Armor-piercing hit"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dirt blast, small */
-// autogenerated using string template disenumpart2.txt
-
     DIRT_BLAST_SMALL (11, "Dirt blast, small"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dirt blast, medium */
-// autogenerated using string template disenumpart2.txt
-
     DIRT_BLAST_MEDIUM (12, "Dirt blast, medium"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dirt blast, large */
-// autogenerated using string template disenumpart2.txt
-
     DIRT_BLAST_LARGE (13, "Dirt blast, large"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Water blast, small */
-// autogenerated using string template disenumpart2.txt
-
     WATER_BLAST_SMALL (14, "Water blast, small"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Water blast, medium */
-// autogenerated using string template disenumpart2.txt
-
     WATER_BLAST_MEDIUM (15, "Water blast, medium"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Water blast, large */
-// autogenerated using string template disenumpart2.txt
-
     WATER_BLAST_LARGE (16, "Water blast, large"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Air hit */
-// autogenerated using string template disenumpart2.txt
-
     AIR_HIT (17, "Air hit"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Building hit, small */
-// autogenerated using string template disenumpart2.txt
-
     BUILDING_HIT_SMALL (18, "Building hit, small"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Building hit, medium */
-// autogenerated using string template disenumpart2.txt
-
     BUILDING_HIT_MEDIUM (19, "Building hit, medium"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Building hit, large */
-// autogenerated using string template disenumpart2.txt
-
     BUILDING_HIT_LARGE (20, "Building hit, large"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mine-clearing line charge */
-// autogenerated using string template disenumpart2.txt
-
     MINE_CLEARING_LINE_CHARGE (21, "Mine-clearing line charge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Environment object impact */
-// autogenerated using string template disenumpart2.txt
-
     ENVIRONMENT_OBJECT_IMPACT (22, "Environment object impact"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Environment object proximate detonation */
-// autogenerated using string template disenumpart2.txt
-
     ENVIRONMENT_OBJECT_PROXIMATE_DETONATION (23, "Environment object proximate detonation"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Water Impact */
-// autogenerated using string template disenumpart2.txt
-
     WATER_IMPACT (24, "Water Impact"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Air Burst */
-// autogenerated using string template disenumpart2.txt
-
     AIR_BURST (25, "Air Burst"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Kill with fragment type 1 */
-// autogenerated using string template disenumpart2.txt
-
     KILL_WITH_FRAGMENT_TYPE_1 (26, "Kill with fragment type 1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Kill with fragment type 2 */
-// autogenerated using string template disenumpart2.txt
-
     KILL_WITH_FRAGMENT_TYPE_2 (27, "Kill with fragment type 2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Kill with fragment type 3 */
-// autogenerated using string template disenumpart2.txt
-
     IDENTIFICATION_FRIEND_OR_FOE (28, "Kill with fragment type 3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Kill with fragment type 1 after fly-out failure */
-// autogenerated using string template disenumpart2.txt
-
     KILL_WITH_FRAGMENT_TYPE_1_AFTER_FLY_OUT_FAILURE (29, "Kill with fragment type 1 after fly-out failure"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Kill with fragment type 2 after fly-out failure */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Kill with fragment type 2 after fly-out failure"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Miss due to fly-out failure */
-// autogenerated using string template disenumpart2.txt
-
     MISS_DUE_TO_FLY_OUT_FAILURE (31, "Miss due to fly-out failure"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Miss due to end-game failure */
-// autogenerated using string template disenumpart2.txt
-
     MISS_DUE_TO_END_GAME_FAILURE (32, "Miss due to end-game failure"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Miss due to fly-out and end-game failure */
-// autogenerated using string template disenumpart2.txt
-
-    MISS_DUE_TO_FLY_OUT_AND_END_GAME_FAILURE (33, "Miss due to fly-out and end-game failure"),;
-
-// autogenerated using string template disenumpart25.txt
+    MISS_DUE_TO_FLY_OUT_AND_END_GAME_FAILURE (33, "Miss due to fly-out and end-game failure");
 
     private int value;
     private final String description;
@@ -272,8 +131,6 @@ public enum DetonationResult
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java b/src-generated/edu/nps/moves/dis7/enumerations/DisPduType.java
similarity index 51%
rename from src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DisPduType.java
index 200762d094bc58011b123fb56f9f260ed830dce3..6c16a5aad0b33ccfae92af59f14516c2f2f8e40f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DisPduType.java
@@ -7,456 +7,159 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 4,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 4 marshal size 8<br>
  * DISPDUType
  */
 public enum DisPduType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Entity State */
-// autogenerated using string template disenumpart2.txt
-
     ENTITY_STATE (1, "Entity State"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fire */
-// autogenerated using string template disenumpart2.txt
-
     FIRE (2, "Fire"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Detonation */
-// autogenerated using string template disenumpart2.txt
-
     DETONATION (3, "Detonation"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Collision */
-// autogenerated using string template disenumpart2.txt
-
     COLLISION (4, "Collision"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Service Request */
-// autogenerated using string template disenumpart2.txt
-
     SERVICE_REQUEST (5, "Service Request"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Resupply Offer */
-// autogenerated using string template disenumpart2.txt
-
     RESUPPLY_OFFER (6, "Resupply Offer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Resupply Received */
-// autogenerated using string template disenumpart2.txt
-
     RESUPPLY_RECEIVED (7, "Resupply Received"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Resupply Cancel */
-// autogenerated using string template disenumpart2.txt
-
     RESUPPLY_CANCEL (8, "Resupply Cancel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Repair Complete */
-// autogenerated using string template disenumpart2.txt
-
     REPAIR_COMPLETE (9, "Repair Complete"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Repair Response */
-// autogenerated using string template disenumpart2.txt
-
     REPAIR_RESPONSE (10, "Repair Response"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Create Entity */
-// autogenerated using string template disenumpart2.txt
-
     CREATE_ENTITY (11, "Create Entity"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Remove Entity */
-// autogenerated using string template disenumpart2.txt
-
     REMOVE_ENTITY (12, "Remove Entity"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Start/Resume */
-// autogenerated using string template disenumpart2.txt
-
     START_RESUME (13, "Start/Resume"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Stop/Freeze */
-// autogenerated using string template disenumpart2.txt
-
     STOP_FREEZE (14, "Stop/Freeze"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Acknowledge */
-// autogenerated using string template disenumpart2.txt
-
     ACKNOWLEDGE (15, "Acknowledge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Action Request */
-// autogenerated using string template disenumpart2.txt
-
     ACTION_REQUEST (16, "Action Request"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Action Response */
-// autogenerated using string template disenumpart2.txt
-
     ACTION_RESPONSE (17, "Action Response"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Data Query */
-// autogenerated using string template disenumpart2.txt
-
     DATA_QUERY (18, "Data Query"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Set Data */
-// autogenerated using string template disenumpart2.txt
-
     SET_DATA (19, "Set Data"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Data */
-// autogenerated using string template disenumpart2.txt
-
     DATA (20, "Data"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Event Report */
-// autogenerated using string template disenumpart2.txt
-
     EVENT_REPORT (21, "Event Report"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Comment */
-// autogenerated using string template disenumpart2.txt
-
     COMMENT (22, "Comment"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Electromagnetic Emission */
-// autogenerated using string template disenumpart2.txt
-
     ELECTROMAGNETIC_EMISSION (23, "Electromagnetic Emission"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Designator */
-// autogenerated using string template disenumpart2.txt
-
     DESIGNATOR (24, "Designator"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Transmitter */
-// autogenerated using string template disenumpart2.txt
-
     TRANSMITTER (25, "Transmitter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Signal */
-// autogenerated using string template disenumpart2.txt
-
     SIGNAL (26, "Signal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Receiver */
-// autogenerated using string template disenumpart2.txt
-
     RECEIVER (27, "Receiver"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** IFF */
-// autogenerated using string template disenumpart2.txt
-
     IDENTIFICATION_FRIEND_OR_FOE (28, "IFF"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Underwater Acoustic */
-// autogenerated using string template disenumpart2.txt
-
     UNDERWATER_ACOUSTIC (29, "Underwater Acoustic"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Supplemental Emission / Entity State */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Supplemental Emission / Entity State"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Intercom Signal */
-// autogenerated using string template disenumpart2.txt
-
     INTERCOM_SIGNAL (31, "Intercom Signal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Intercom Control */
-// autogenerated using string template disenumpart2.txt
-
     INTERCOM_CONTROL (32, "Intercom Control"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Aggregate State */
-// autogenerated using string template disenumpart2.txt
-
     AGGREGATE_STATE (33, "Aggregate State"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** IsGroupOf */
-// autogenerated using string template disenumpart2.txt
-
     ISGROUPOF (34, "IsGroupOf"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Transfer Ownership */
-// autogenerated using string template disenumpart2.txt
-
     TRANSFER_OWNERSHIP (35, "Transfer Ownership"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** IsPartOf */
-// autogenerated using string template disenumpart2.txt
-
     ISPARTOF (36, "IsPartOf"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Minefield State */
-// autogenerated using string template disenumpart2.txt
-
     MINEFIELD_STATE (37, "Minefield State"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Minefield Query */
-// autogenerated using string template disenumpart2.txt
-
     MINEFIELD_QUERY (38, "Minefield Query"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Minefield Data */
-// autogenerated using string template disenumpart2.txt
-
     MINEFIELD_DATA (39, "Minefield Data"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Minefield Response NACK */
-// autogenerated using string template disenumpart2.txt
-
     MINEFIELD_RESPONSE_NACK (40, "Minefield Response NACK"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Environmental Process */
-// autogenerated using string template disenumpart2.txt
-
     ENVIRONMENTAL_PROCESS (41, "Environmental Process"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Gridded Data */
-// autogenerated using string template disenumpart2.txt
-
     GRIDDED_DATA (42, "Gridded Data"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Point Object State */
-// autogenerated using string template disenumpart2.txt
-
     POINT_OBJECT_STATE (43, "Point Object State"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Linear Object State */
-// autogenerated using string template disenumpart2.txt
-
     LINEAR_OBJECT_STATE (44, "Linear Object State"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Areal Object State */
-// autogenerated using string template disenumpart2.txt
-
     AREAL_OBJECT_STATE (45, "Areal Object State"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** TSPI */
-// autogenerated using string template disenumpart2.txt
-
     TIME_SPACE_POSITION_INFORMATION (46, "TSPI"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Appearance */
-// autogenerated using string template disenumpart2.txt
-
     APPEARANCE (47, "Appearance"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Articulated Parts */
-// autogenerated using string template disenumpart2.txt
-
     ARTICULATED_PARTS (48, "Articulated Parts"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** LE Fire */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_FIRE (49, "LE Fire"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** LE Detonation */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "LE Detonation"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Create Entity-R */
-// autogenerated using string template disenumpart2.txt
-
     CREATE_ENTITY_RELIABLE (51, "Create Entity-R"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Remove Entity-R */
-// autogenerated using string template disenumpart2.txt
-
     REMOVE_ENTITY_RELIABLE (52, "Remove Entity-R"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Start/Resume-R */
-// autogenerated using string template disenumpart2.txt
-
     START_RESUME_RELIABLE (53, "Start/Resume-R"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Stop/Freeze-R */
-// autogenerated using string template disenumpart2.txt
-
     STOP_FREEZE_RELIABLE (54, "Stop/Freeze-R"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Acknowledge-R */
-// autogenerated using string template disenumpart2.txt
-
     ACKNOWLEDGE_RELIABLE (55, "Acknowledge-R"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Action Request-R */
-// autogenerated using string template disenumpart2.txt
-
     ACTION_REQUEST_RELIABLE (56, "Action Request-R"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Action Response-R */
-// autogenerated using string template disenumpart2.txt
-
     ACTION_RESPONSE_RELIABLE (57, "Action Response-R"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Data Query-R */
-// autogenerated using string template disenumpart2.txt
-
     DATA_QUERY_RELIABLE (58, "Data Query-R"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Set Data-R */
-// autogenerated using string template disenumpart2.txt
-
     SET_DATA_RELIABLE (59, "Set Data-R"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Data-R */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "Data-R"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Event Report-R */
-// autogenerated using string template disenumpart2.txt
-
     EVENT_REPORT_RELIABLE (61, "Event Report-R"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Comment-R */
-// autogenerated using string template disenumpart2.txt
-
     COMMENT_RELIABLE (62, "Comment-R"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Record-R */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_RELIABLE (63, "Record-R"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Set Record-R */
-// autogenerated using string template disenumpart2.txt
-
     SET_RECORD_RELIABLE	 (64, "Set Record-R"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Record Query-R */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_QUERY_RELIABLE (65, "Record Query-R"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Collision-Elastic */
-// autogenerated using string template disenumpart2.txt
-
     COLLISION_ELASTIC (66, "Collision-Elastic"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Entity State Update */
-// autogenerated using string template disenumpart2.txt
-
     ENTITY_STATE_UPDATE (67, "Entity State Update"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Directed Energy Fire */
-// autogenerated using string template disenumpart2.txt
-
     DIRECTED_ENERGY_FIRE (68, "Directed Energy Fire"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Entity Damage Status */
-// autogenerated using string template disenumpart2.txt
-
     ENTITY_DAMAGE_STATUS (69, "Entity Damage Status"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Information Operations Action */
-// autogenerated using string template disenumpart2.txt
-
     INFORMATION_OPERATIONS_ACTION (70, "Information Operations Action"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Information Operations Report */
-// autogenerated using string template disenumpart2.txt
-
     INFORMATION_OPERATIONS_REPORT (71, "Information Operations Report"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Attribute */
-// autogenerated using string template disenumpart2.txt
-
-    ATTRIBUTE (72, "Attribute"),;
-
-// autogenerated using string template disenumpart25.txt
+    ATTRIBUTE (72, "Attribute");
 
     private int value;
     private final String description;
@@ -506,8 +209,6 @@ public enum DisPduType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EEAttributeStateIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/EEAttributeStateIndicator.java
index e46714ede3c1d4c1b7872ed78a43b71ecf71214d..7b884e4c255d2bc4b73590e23a1eb76c552a3e22 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EEAttributeStateIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EEAttributeStateIndicator.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 300,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 300 marshal size 8<br>
  * EEAttributeStateIndicator
  */
 public enum EEAttributeStateIndicator 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Heartbeat Update */
-// autogenerated using string template disenumpart2.txt
-
     HEARTBEAT_UPDATE (0, "Heartbeat Update"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Changed Data */
-// autogenerated using string template disenumpart2.txt
-
     CHANGED_DATA (1, "Changed Data"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Has Ceased */
-// autogenerated using string template disenumpart2.txt
-
-    HAS_CEASED (2, "Has Ceased"),;
-
-// autogenerated using string template disenumpart25.txt
+    HAS_CEASED (2, "Has Ceased");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum EEAttributeStateIndicator
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionBeamFunction.java b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionBeamFunction.java
index 18b23b9a0230a964d5ee8809e57a0c68257ec4a7..47c9da4b0593759178d5cb61653b61c39024a0b5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionBeamFunction.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionBeamFunction.java
@@ -7,162 +7,61 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 78,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 78 marshal size 8<br>
  * ElectromagneticEmissionBeamFunction
  */
 public enum ElectromagneticEmissionBeamFunction 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Search */
-// autogenerated using string template disenumpart2.txt
-
     SEARCH (1, "Search"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Height Finding */
-// autogenerated using string template disenumpart2.txt
-
     HEIGHT_FINDING (2, "Height Finding"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Acquisition */
-// autogenerated using string template disenumpart2.txt
-
     ACQUISITION (3, "Acquisition"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tracking */
-// autogenerated using string template disenumpart2.txt
-
     TRACKING (4, "Tracking"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Acquisition and tracking */
-// autogenerated using string template disenumpart2.txt
-
     ACQUISITION_AND_TRACKING (5, "Acquisition and tracking"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Command guidance */
-// autogenerated using string template disenumpart2.txt
-
     COMMAND_GUIDANCE (6, "Command guidance"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Illumination */
-// autogenerated using string template disenumpart2.txt
-
     ILLUMINATION (7, "Illumination"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ranging */
-// autogenerated using string template disenumpart2.txt
-
     RANGING (8, "Ranging"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Missile beacon */
-// autogenerated using string template disenumpart2.txt
-
     MISSILE_BEACON (9, "Missile beacon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Missile Fusing */
-// autogenerated using string template disenumpart2.txt
-
     MISSILE_FUSING (10, "Missile Fusing"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Active radar missile seeker */
-// autogenerated using string template disenumpart2.txt
-
     ACTIVE_RADAR_MISSILE_SEEKER (11, "Active radar missile seeker"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Jamming */
-// autogenerated using string template disenumpart2.txt
-
     JAMMING (12, "Jamming"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** IFF */
-// autogenerated using string template disenumpart2.txt
-
     IFF (13, "IFF"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Navigation / Weather */
-// autogenerated using string template disenumpart2.txt
-
     NAVIGATION_WEATHER (14, "Navigation / Weather"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Meteorological */
-// autogenerated using string template disenumpart2.txt
-
     METEOROLOGICAL (15, "Meteorological"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Data transmission */
-// autogenerated using string template disenumpart2.txt
-
     DATA_TRANSMISSION (16, "Data transmission"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Navigational directional beacon */
-// autogenerated using string template disenumpart2.txt
-
     NAVIGATIONAL_DIRECTIONAL_BEACON (17, "Navigational directional beacon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Time-Shared Search */
-// autogenerated using string template disenumpart2.txt
-
     TIME_SHARED_SEARCH (20, "Time-Shared Search"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Time-Shared Acquisition */
-// autogenerated using string template disenumpart2.txt
-
     TIME_SHARED_ACQUISITION (21, "Time-Shared Acquisition"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Time-Shared Track */
-// autogenerated using string template disenumpart2.txt
-
     TIME_SHARED_TRACK (22, "Time-Shared Track"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Time-Shared Command Guidance */
-// autogenerated using string template disenumpart2.txt
-
     TIME_SHARED_COMMAND_GUIDANCE (23, "Time-Shared Command Guidance"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Time-Shared Illumination */
-// autogenerated using string template disenumpart2.txt
-
     TIME_SHARED_ILLUMINATION (24, "Time-Shared Illumination"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Time-Shared Jamming */
-// autogenerated using string template disenumpart2.txt
-
-    TIME_SHARED_JAMMING (25, "Time-Shared Jamming"),;
-
-// autogenerated using string template disenumpart25.txt
+    TIME_SHARED_JAMMING (25, "Time-Shared Jamming");
 
     private int value;
     private final String description;
@@ -212,8 +111,6 @@ public enum ElectromagneticEmissionBeamFunction
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionStateUpdateIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionStateUpdateIndicator.java
index 8aa4c7bce7a921327916362f23431a99d7953ff1..45a636e093b3e94e97e135bb8f6814b9b9e4b3f5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionStateUpdateIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionStateUpdateIndicator.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 77,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 77 marshal size 8<br>
  * ElectromagneticEmissionStateUpdateIndicator
  */
 public enum ElectromagneticEmissionStateUpdateIndicator 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Heartbeat Update */
-// autogenerated using string template disenumpart2.txt
-
     HEARTBEAT_UPDATE (0, "Heartbeat Update"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Changed Data Update */
-// autogenerated using string template disenumpart2.txt
-
-    CHANGED_DATA_UPDATE (1, "Changed Data Update"),;
-
-// autogenerated using string template disenumpart25.txt
+    CHANGED_DATA_UPDATE (1, "Changed Data Update");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum ElectromagneticEmissionStateUpdateIndicator
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EmitterSystemFunction.java b/src-generated/edu/nps/moves/dis7/enumerations/EmitterSystemFunction.java
index 9dd049477a83c01dd695d61effafcb47d5fde882..25eb8b4594333edea8bee19de885c1f4db1d1ce8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EmitterSystemFunction.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EmitterSystemFunction.java
@@ -7,504 +7,175 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 76,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 76 marshal size 8<br>
  * EmitterSystemFunction
  */
 public enum EmitterSystemFunction 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Multi-function */
-// autogenerated using string template disenumpart2.txt
-
     MULTI_FUNCTION (1, "Multi-function"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Early Warning/Surveillance */
-// autogenerated using string template disenumpart2.txt
-
     EARLY_WARNING_SURVEILLANCE (2, "Early Warning/Surveillance"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Height Finder */
-// autogenerated using string template disenumpart2.txt
-
     HEIGHT_FINDER (3, "Height Finder"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fire Control */
-// autogenerated using string template disenumpart2.txt
-
     FIRE_CONTROL (4, "Fire Control"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Acquisition/Detection */
-// autogenerated using string template disenumpart2.txt
-
     ACQUISITION_DETECTION (5, "Acquisition/Detection"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tracker */
-// autogenerated using string template disenumpart2.txt
-
     TRACKER (6, "Tracker"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Guidance/Illumination */
-// autogenerated using string template disenumpart2.txt
-
     GUIDANCE_ILLUMINATION (7, "Guidance/Illumination"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Firing point/launch point location */
-// autogenerated using string template disenumpart2.txt
-
     FIRING_POINT_LAUNCH_POINT_LOCATION (8, "Firing point/launch point location"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Range-Only */
-// autogenerated using string template disenumpart2.txt
-
     RANGE_ONLY (9, "Range-Only"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Radar Altimeter */
-// autogenerated using string template disenumpart2.txt
-
     RADAR_ALTIMETER (10, "Radar Altimeter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Imaging */
-// autogenerated using string template disenumpart2.txt
-
     IMAGING (11, "Imaging"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Motion Detection */
-// autogenerated using string template disenumpart2.txt
-
     MOTION_DETECTION (12, "Motion Detection"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Navigation */
-// autogenerated using string template disenumpart2.txt
-
     NAVIGATION (13, "Navigation"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Weather / Meteorological */
-// autogenerated using string template disenumpart2.txt
-
     WEATHER_METEOROLOGICAL (14, "Weather / Meteorological"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Instrumentation */
-// autogenerated using string template disenumpart2.txt
-
     INSTRUMENTATION (15, "Instrumentation"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Identification/Classification (including IFF) */
-// autogenerated using string template disenumpart2.txt
-
     IDENTIFICATION_CLASSIFICATION_INCLUDING_IFF (16, "Identification/Classification (including IFF)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** AAA (Anti-Aircraft Artillery) Fire Control */
-// autogenerated using string template disenumpart2.txt
-
     AAA_ANTI_AIRCRAFT_ARTILLERY_FIRE_CONTROL (17, "AAA (Anti-Aircraft Artillery) Fire Control"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Air Search/Bomb */
-// autogenerated using string template disenumpart2.txt
-
     AIR_SEARCH_BOMB (18, "Air Search/Bomb"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Air Intercept */
-// autogenerated using string template disenumpart2.txt
-
     AIR_INTERCEPT (19, "Air Intercept"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Altimeter */
-// autogenerated using string template disenumpart2.txt
-
     ALTIMETER (20, "Altimeter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Air Mapping */
-// autogenerated using string template disenumpart2.txt
-
     AIR_MAPPING (21, "Air Mapping"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Air Traffic Control */
-// autogenerated using string template disenumpart2.txt
-
     AIR_TRAFFIC_CONTROL (22, "Air Traffic Control"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Beacon */
-// autogenerated using string template disenumpart2.txt
-
     BEACON (23, "Beacon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Battlefield Surveillance */
-// autogenerated using string template disenumpart2.txt
-
     BATTLEFIELD_SURVEILLANCE (24, "Battlefield Surveillance"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ground Control Approach */
-// autogenerated using string template disenumpart2.txt
-
     GROUND_CONTROL_APPROACH (25, "Ground Control Approach"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ground Control Intercept */
-// autogenerated using string template disenumpart2.txt
-
     GROUND_CONTROL_INTERCEPT (26, "Ground Control Intercept"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Coastal Surveillance */
-// autogenerated using string template disenumpart2.txt
-
     COASTAL_SURVEILLANCE (27, "Coastal Surveillance"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Decoy/Mimic */
-// autogenerated using string template disenumpart2.txt
-
     IDENTIFICATION_FRIEND_OR_FOE (28, "Decoy/Mimic"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Data Transmission */
-// autogenerated using string template disenumpart2.txt
-
     DATA_TRANSMISSION (29, "Data Transmission"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Earth Surveillance */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Earth Surveillance"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Gun Lay Beacon */
-// autogenerated using string template disenumpart2.txt
-
     GUN_LAY_BEACON (31, "Gun Lay Beacon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ground Mapping */
-// autogenerated using string template disenumpart2.txt
-
     GROUND_MAPPING (32, "Ground Mapping"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Harbor Surveillance */
-// autogenerated using string template disenumpart2.txt
-
     HARBOR_SURVEILLANCE (33, "Harbor Surveillance"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** IFF (Identify Friend or Foe) */
-// autogenerated using string template disenumpart2.txt
-
     IFF_IDENTIFY_FRIEND_OR_FOE (34, "IFF (Identify Friend or Foe)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** ILS (Instrument Landing System) */
-// autogenerated using string template disenumpart2.txt
-
     ILS_INSTRUMENT_LANDING_SYSTEM (35, "ILS (Instrument Landing System)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ionospheric Sound */
-// autogenerated using string template disenumpart2.txt
-
     IONOSPHERIC_SOUND (36, "Ionospheric Sound"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Interrogator */
-// autogenerated using string template disenumpart2.txt
-
     INTERROGATOR (37, "Interrogator"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Barrage Jamming */
-// autogenerated using string template disenumpart2.txt
-
     BARRAGE_JAMMING (38, "Barrage Jamming"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Click Jamming */
-// autogenerated using string template disenumpart2.txt
-
     CLICK_JAMMING (39, "Click Jamming"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Deceptive Jamming */
-// autogenerated using string template disenumpart2.txt
-
     DECEPTIVE_JAMMING (40, "Deceptive Jamming"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Frequency Swept Jamming */
-// autogenerated using string template disenumpart2.txt
-
     FREQUENCY_SWEPT_JAMMING (41, "Frequency Swept Jamming"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Jammer */
-// autogenerated using string template disenumpart2.txt
-
     JAMMER (42, "Jammer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Noise Jamming */
-// autogenerated using string template disenumpart2.txt
-
     NOISE_JAMMING (43, "Noise Jamming"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pulsed Jamming */
-// autogenerated using string template disenumpart2.txt
-
     PULSED_JAMMING (44, "Pulsed Jamming"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Repeater Jamming */
-// autogenerated using string template disenumpart2.txt
-
     REPEATER_JAMMING (45, "Repeater Jamming"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Spot Noise Jamming */
-// autogenerated using string template disenumpart2.txt
-
     TIME_SPACE_POSITION_INFORMATION (46, "Spot Noise Jamming"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Missile Acquisition */
-// autogenerated using string template disenumpart2.txt
-
     MISSILE_ACQUISITION (47, "Missile Acquisition"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Missile Downlink */
-// autogenerated using string template disenumpart2.txt
-
     MISSILE_DOWNLINK (48, "Missile Downlink"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Meteorological */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_FIRE (49, "Meteorological"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Space */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "Space"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Surface Search */
-// autogenerated using string template disenumpart2.txt
-
     CREATE_ENTITY_RELIABLE (51, "Surface Search"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Shell Tracking */
-// autogenerated using string template disenumpart2.txt
-
     REMOVE_ENTITY_RELIABLE (52, "Shell Tracking"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Television */
-// autogenerated using string template disenumpart2.txt
-
     ACTION_REQUEST_RELIABLE (56, "Television"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Unknown */
-// autogenerated using string template disenumpart2.txt
-
     ACTION_RESPONSE_RELIABLE (57, "Unknown"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Video Remoting */
-// autogenerated using string template disenumpart2.txt
-
     DATA_QUERY_RELIABLE (58, "Video Remoting"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Experimental or Training */
-// autogenerated using string template disenumpart2.txt
-
     SET_DATA_RELIABLE (59, "Experimental or Training"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Missile Guidance */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "Missile Guidance"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Missile Homing */
-// autogenerated using string template disenumpart2.txt
-
     EVENT_REPORT_RELIABLE (61, "Missile Homing"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Missile Tracking */
-// autogenerated using string template disenumpart2.txt
-
     COMMENT_RELIABLE (62, "Missile Tracking"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Jamming, noise */
-// autogenerated using string template disenumpart2.txt
-
     SET_RECORD_RELIABLE	 (64, "Jamming, noise"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Jamming, deception */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_QUERY_RELIABLE (65, "Jamming, deception"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Decoy */
-// autogenerated using string template disenumpart2.txt
-
     DECOY (66, "Decoy"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Navigation/Distance Measuring Equipment */
-// autogenerated using string template disenumpart2.txt
-
     NAVIGATION_DISTANCE_MEASURING_EQUIPMENT (71, "Navigation/Distance Measuring Equipment"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Terrain Following */
-// autogenerated using string template disenumpart2.txt
-
     TERRAIN_FOLLOWING (72, "Terrain Following"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Weather Avoidance */
-// autogenerated using string template disenumpart2.txt
-
     WEATHER_AVOIDANCE (73, "Weather Avoidance"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Proximity Fuse */
-// autogenerated using string template disenumpart2.txt
-
     PROXIMITY_FUSE (74, "Proximity Fuse"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Instrumentation */
-// autogenerated using string template disenumpart2.txt
-
     INSTRUMENTATION_2 (75, "Instrumentation"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Radiosonde */
-// autogenerated using string template disenumpart2.txt
-
     RADIOSONDE (76, "Radiosonde"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sonobuoy */
-// autogenerated using string template disenumpart2.txt
-
     SONOBUOY (77, "Sonobuoy"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bathythermal Sensor */
-// autogenerated using string template disenumpart2.txt
-
     BATHYTHERMAL_SENSOR (78, "Bathythermal Sensor"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Towed Counter Measure */
-// autogenerated using string template disenumpart2.txt
-
     TOWED_COUNTER_MEASURE (79, "Towed Counter Measure"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dipping Sonar */
-// autogenerated using string template disenumpart2.txt
-
     DIPPING_SONAR (80, "Dipping Sonar"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Towed Acoustic Sensor */
-// autogenerated using string template disenumpart2.txt
-
     TOWED_ACOUSTIC_SENSOR (81, "Towed Acoustic Sensor"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Weapon, non-lethal */
-// autogenerated using string template disenumpart2.txt
-
     WEAPON_NON_LETHAL (96, "Weapon, non-lethal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Weapon, lethal */
-// autogenerated using string template disenumpart2.txt
-
     WEAPON_LETHAL (97, "Weapon, lethal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Test Equipment */
-// autogenerated using string template disenumpart2.txt
-
     TEST_EQUIPMENT (98, "Test Equipment"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Acquisition Track */
-// autogenerated using string template disenumpart2.txt
-
     ACQUISITION_TRACK (99, "Acquisition Track"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Track Guidance */
-// autogenerated using string template disenumpart2.txt
-
     TRACK_GUIDANCE (100, "Track Guidance"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Guidance Illumination Track Acquisition */
-// autogenerated using string template disenumpart2.txt
-
     GUIDANCE_ILLUMINATION_TRACK_ACQUISITION (101, "Guidance Illumination Track Acquisition"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Search Acquisition */
-// autogenerated using string template disenumpart2.txt
-
-    SEARCH_ACQUISITION (102, "Search Acquisition"),;
-
-// autogenerated using string template disenumpart25.txt
+    SEARCH_ACQUISITION (102, "Search Acquisition");
 
     private int value;
     private final String description;
@@ -554,8 +225,6 @@ public enum EmitterSystemFunction
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationStatus.java
index 4068674a033765923b4b29945a778f4c36be4765..db0646230670b48903d02f98dc904c1bf886d1c4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationStatus.java
@@ -7,60 +7,27 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 319,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 319 marshal size 8<br>
  * EntityAssociationAssociationStatus
  */
 public enum EntityAssociationAssociationStatus 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Specified */
-// autogenerated using string template disenumpart2.txt
-
     NOT_SPECIFIED (0, "Not Specified"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Physical Association (General/Object 1) */
-// autogenerated using string template disenumpart2.txt
-
     PHYSICAL_ASSOCIATION_GENERAL_OBJECT_1 (1, "Physical Association (General/Object 1)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Functional Association (General) */
-// autogenerated using string template disenumpart2.txt
-
     FUNCTIONAL_ASSOCIATION_GENERAL (2, "Functional Association (General)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Association Broken */
-// autogenerated using string template disenumpart2.txt
-
     ASSOCIATION_BROKEN (3, "Association Broken"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Physical Association (Object 2) */
-// autogenerated using string template disenumpart2.txt
-
     PHYSICAL_ASSOCIATION_OBJECT_2 (4, "Physical Association (Object 2)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Functional Association (Object 1) */
-// autogenerated using string template disenumpart2.txt
-
     FUNCTIONAL_ASSOCIATION_OBJECT_1 (5, "Functional Association (Object 1)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Functional Association (Object 2) */
-// autogenerated using string template disenumpart2.txt
-
-    FUNCTIONAL_ASSOCIATION_OBJECT_2 (6, "Functional Association (Object 2)"),;
-
-// autogenerated using string template disenumpart25.txt
+    FUNCTIONAL_ASSOCIATION_OBJECT_2 (6, "Functional Association (Object 2)");
 
     private int value;
     private final String description;
@@ -110,8 +77,6 @@ public enum EntityAssociationAssociationStatus
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationType.java
index 6730445c37d216a0199075b995c825425b06decd..809c0e00740861ea842966033a9aa4214fb24c4f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationType.java
@@ -7,108 +7,43 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 330,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 330 marshal size 8<br>
  * EntityAssociationAssociationType
  */
 public enum EntityAssociationAssociationType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Target Entity */
-// autogenerated using string template disenumpart2.txt
-
     TARGET_ENTITY (1, "Target Entity"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Target Location */
-// autogenerated using string template disenumpart2.txt
-
     TARGET_LOCATION (2, "Target Location"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Home Base Location */
-// autogenerated using string template disenumpart2.txt
-
     HOME_BASE_LOCATION (3, "Home Base Location"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** CAP Point Location */
-// autogenerated using string template disenumpart2.txt
-
     CAP_POINT_LOCATION (4, "CAP Point Location"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Flight Leader */
-// autogenerated using string template disenumpart2.txt
-
     FLIGHT_LEADER (5, "Flight Leader"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Flight Member */
-// autogenerated using string template disenumpart2.txt
-
     FLIGHT_MEMBER (6, "Flight Member"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** IP Point */
-// autogenerated using string template disenumpart2.txt
-
     IP_POINT (7, "IP Point"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Rendezvous Point */
-// autogenerated using string template disenumpart2.txt
-
     RENDEZVOUS_POINT (8, "Rendezvous Point"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** On-Station Location */
-// autogenerated using string template disenumpart2.txt
-
     ON_STATION_LOCATION (9, "On-Station Location"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Landing Zone Location */
-// autogenerated using string template disenumpart2.txt
-
     LANDING_ZONE_LOCATION (10, "Landing Zone Location"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Downed Pilot */
-// autogenerated using string template disenumpart2.txt
-
     DOWNED_PILOT (11, "Downed Pilot"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tanker Entity that Is Currently Refueling the Transferred Entity */
-// autogenerated using string template disenumpart2.txt
-
     TANKER_ENTITY_THAT_IS_CURRENTLY_REFUELING_THE_TRANSFERRED_ENTITY (12, "Tanker Entity that Is Currently Refueling the Transferred Entity"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tanker Entity the Transferred Entity Is Headed towards to Refuel */
-// autogenerated using string template disenumpart2.txt
-
     TANKER_ENTITY_THE_TRANSFERRED_ENTITY_IS_HEADED_TOWARDS_TO_REFUEL (13, "Tanker Entity the Transferred Entity Is Headed towards to Refuel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Entity Headed towards to Join Up With */
-// autogenerated using string template disenumpart2.txt
-
-    ENTITY_HEADED_TOWARDS_TO_JOIN_UP_WITH (14, "Entity Headed towards to Join Up With"),;
-
-// autogenerated using string template disenumpart25.txt
+    ENTITY_HEADED_TOWARDS_TO_JOIN_UP_WITH (14, "Entity Headed towards to Join Up With");
 
     private int value;
     private final String description;
@@ -158,8 +93,6 @@ public enum EntityAssociationAssociationType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationGroupMemberType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationGroupMemberType.java
index 35ef6c36577e49067d775a06451c661c08f8563e..4afcbe46159fc61ff59a88d0cf45be7ef5349c91 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationGroupMemberType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationGroupMemberType.java
@@ -7,60 +7,27 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 321,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 321 marshal size 8<br>
  * EntityAssociationGroupMemberType
  */
 public enum EntityAssociationGroupMemberType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Part of a Group */
-// autogenerated using string template disenumpart2.txt
-
     NOT_PART_OF_A_GROUP (0, "Not Part of a Group"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Group Leader */
-// autogenerated using string template disenumpart2.txt
-
     GROUP_LEADER (1, "Group Leader"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Group Member */
-// autogenerated using string template disenumpart2.txt
-
     GROUP_MEMBER (2, "Group Member"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Formation Leader */
-// autogenerated using string template disenumpart2.txt
-
     FORMATION_LEADER (3, "Formation Leader"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Formation Member */
-// autogenerated using string template disenumpart2.txt
-
     FORMATION_MEMBER (4, "Formation Member"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Convoy Leader */
-// autogenerated using string template disenumpart2.txt
-
     CONVOY_LEADER (5, "Convoy Leader"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Convoy Member */
-// autogenerated using string template disenumpart2.txt
-
-    CONVOY_MEMBER (6, "Convoy Member"),;
-
-// autogenerated using string template disenumpart25.txt
+    CONVOY_MEMBER (6, "Convoy Member");
 
     private int value;
     private final String description;
@@ -110,8 +77,6 @@ public enum EntityAssociationGroupMemberType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalAssociationType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalAssociationType.java
index 856142a50d1d121f8c067f890e21ff18709358e0..dc1191580974c957083fb8afad1b53f338c87419 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalAssociationType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalAssociationType.java
@@ -7,186 +7,69 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 323,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 323 marshal size 8<br>
  * EntityAssociationPhysicalAssociationType
  */
 public enum EntityAssociationPhysicalAssociationType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Specified */
-// autogenerated using string template disenumpart2.txt
-
     NOT_SPECIFIED (0, "Not Specified"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Towed in Air (Single Hook, Not Specified) */
-// autogenerated using string template disenumpart2.txt
-
     TOWED_IN_AIR_SINGLE_HOOK_NOT_SPECIFIED (1, "Towed in Air (Single Hook, Not Specified)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Towed on Land */
-// autogenerated using string template disenumpart2.txt
-
     TOWED_ON_LAND (2, "Towed on Land"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Towed on Water Surface */
-// autogenerated using string template disenumpart2.txt
-
     TOWED_ON_WATER_SURFACE (3, "Towed on Water Surface"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Towed Underwater */
-// autogenerated using string template disenumpart2.txt
-
     TOWED_UNDERWATER (4, "Towed Underwater"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mounted Attached */
-// autogenerated using string template disenumpart2.txt
-
     MOUNTED_ATTACHED (5, "Mounted Attached"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mounted Unattached and Unsupported */
-// autogenerated using string template disenumpart2.txt
-
     MOUNTED_UNATTACHED_AND_UNSUPPORTED (6, "Mounted Unattached and Unsupported"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mounted Unattached and Supported */
-// autogenerated using string template disenumpart2.txt
-
     MOUNTED_UNATTACHED_AND_SUPPORTED (7, "Mounted Unattached and Supported"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Towed in Air (Center Hook) */
-// autogenerated using string template disenumpart2.txt
-
     TOWED_IN_AIR_CENTER_HOOK (8, "Towed in Air (Center Hook)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Towed in Air (Forward Hook) */
-// autogenerated using string template disenumpart2.txt
-
     TOWED_IN_AIR_FORWARD_HOOK (9, "Towed in Air (Forward Hook)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Towed in Air (Aft Hook) */
-// autogenerated using string template disenumpart2.txt
-
     TOWED_IN_AIR_AFT_HOOK (10, "Towed in Air (Aft Hook)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Towed in Air (Tandem Hook - Fore and Aft) */
-// autogenerated using string template disenumpart2.txt
-
     TOWED_IN_AIR_TANDEM_HOOK_FORE_AND_AFT (11, "Towed in Air (Tandem Hook - Fore and Aft)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Towed in Air (Mismanaged Tandem - Fore and Center) */
-// autogenerated using string template disenumpart2.txt
-
     TOWED_IN_AIR_MISMANAGED_TANDEM_FORE_AND_CENTER (12, "Towed in Air (Mismanaged Tandem - Fore and Center)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Towed in Air (Mismanaged Tandem - Center and Aft) */
-// autogenerated using string template disenumpart2.txt
-
     TOWED_IN_AIR_MISMANAGED_TANDEM_CENTER_AND_AFT (13, "Towed in Air (Mismanaged Tandem - Center and Aft)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Towed in Air (All Hooks) */
-// autogenerated using string template disenumpart2.txt
-
     TOWED_IN_AIR_ALL_HOOKS (14, "Towed in Air (All Hooks)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hoisted */
-// autogenerated using string template disenumpart2.txt
-
     HOISTED (15, "Hoisted"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Restrained to a Lifeform */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Restrained to a Lifeform"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Restrained to a Platform */
-// autogenerated using string template disenumpart2.txt
-
     RESTRAINED_TO_A_PLATFORM (31, "Restrained to a Platform"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Restrained to an Object */
-// autogenerated using string template disenumpart2.txt
-
     RESTRAINED_TO_AN_OBJECT (32, "Restrained to an Object"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Refueling Operation */
-// autogenerated using string template disenumpart2.txt
-
     EVENT_REPORT_RELIABLE (61, "Refueling Operation"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Search and Rescue Basket */
-// autogenerated using string template disenumpart2.txt
-
     COMMENT_RELIABLE (62, "Search and Rescue Basket"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Search and Rescue Rescue Collar */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_RELIABLE (63, "Search and Rescue Rescue Collar"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Engagement/Object 2 is Being Engaged */
-// autogenerated using string template disenumpart2.txt
-
     SET_RECORD_RELIABLE	 (64, "Engagement/Object 2 is Being Engaged"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Return To Base/Object 2 is the Destination Object */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_QUERY_RELIABLE (65, "Return To Base/Object 2 is the Destination Object"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Line between Communication Towers */
-// autogenerated using string template disenumpart2.txt
-
     LINE_BETWEEN_COMMUNICATION_TOWERS (90, "Line between Communication Towers"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Line Between Power Towers */
-// autogenerated using string template disenumpart2.txt
-
     LINE_BETWEEN_POWER_TOWERS (91, "Line Between Power Towers"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Indoors */
-// autogenerated using string template disenumpart2.txt
-
     INDOORS (92, "Indoors"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Roof */
-// autogenerated using string template disenumpart2.txt
-
-    ROOF (93, "Roof"),;
-
-// autogenerated using string template disenumpart25.txt
+    ROOF (93, "Roof");
 
     private int value;
     private final String description;
@@ -236,8 +119,6 @@ public enum EntityAssociationPhysicalAssociationType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalConnectionType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalConnectionType.java
index f281162f047dac2d9a40d015f3c92d6aee1a2155..6540871d79e564031f1a83215d41289acb4e951c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalConnectionType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalConnectionType.java
@@ -7,96 +7,39 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 324,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 324 marshal size 8<br>
  * EntityAssociationPhysicalConnectionType
  */
 public enum EntityAssociationPhysicalConnectionType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Specified */
-// autogenerated using string template disenumpart2.txt
-
     NOT_SPECIFIED (0, "Not Specified"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Attached Directly to Surface */
-// autogenerated using string template disenumpart2.txt
-
     ATTACHED_DIRECTLY_TO_SURFACE (1, "Attached Directly to Surface"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cable Wire */
-// autogenerated using string template disenumpart2.txt
-
     CABLE_WIRE (2, "Cable Wire"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Rope */
-// autogenerated using string template disenumpart2.txt
-
     ROPE (3, "Rope"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Chain */
-// autogenerated using string template disenumpart2.txt
-
     CHAIN (4, "Chain"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Power Line */
-// autogenerated using string template disenumpart2.txt
-
     POWER_LINE (5, "Power Line"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Telephone Line */
-// autogenerated using string template disenumpart2.txt
-
     TELEPHONE_LINE (6, "Telephone Line"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cable Line */
-// autogenerated using string template disenumpart2.txt
-
     CABLE_LINE (7, "Cable Line"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Refueling Drogue */
-// autogenerated using string template disenumpart2.txt
-
     REFUELING_DROGUE (8, "Refueling Drogue"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Refueling Boom */
-// autogenerated using string template disenumpart2.txt
-
     REFUELING_BOOM (9, "Refueling Boom"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Handcuffs */
-// autogenerated using string template disenumpart2.txt
-
     HANDCUFFS (10, "Handcuffs"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** In Contact With */
-// autogenerated using string template disenumpart2.txt
-
     IN_CONTACT_WITH (11, "In Contact With"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fast Rope */
-// autogenerated using string template disenumpart2.txt
-
-    FAST_ROPE (12, "Fast Rope"),;
-
-// autogenerated using string template disenumpart25.txt
+    FAST_ROPE (12, "Fast Rope");
 
     private int value;
     private final String description;
@@ -146,8 +89,6 @@ public enum EntityAssociationPhysicalConnectionType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityDamageStatusComponentIdentification.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityDamageStatusComponentIdentification.java
index 2232f961f5beb2b2b0d2d15c3dd799a13b20bdfc..324d9fc6a3db601444255958c689f293efd63528 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityDamageStatusComponentIdentification.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityDamageStatusComponentIdentification.java
@@ -7,78 +7,33 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 314,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 314 marshal size 8<br>
  * EntityDamageStatusComponentIdentification
  */
 public enum EntityDamageStatusComponentIdentification 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Entity Center (No Specific Component) */
-// autogenerated using string template disenumpart2.txt
-
     ENTITY_CENTER_NO_SPECIFIC_COMPONENT (0, "Entity Center (No Specific Component)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Entity Structure */
-// autogenerated using string template disenumpart2.txt
-
     ENTITY_STRUCTURE (1, "Entity Structure"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Control System */
-// autogenerated using string template disenumpart2.txt
-
     CONTROL_SYSTEM (2, "Control System"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Control Surface */
-// autogenerated using string template disenumpart2.txt
-
     CONTROL_SURFACE (3, "Control Surface"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Engine / Propulsion System */
-// autogenerated using string template disenumpart2.txt
-
     ENGINE_PROPULSION_SYSTEM (4, "Engine / Propulsion System"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Crew Member */
-// autogenerated using string template disenumpart2.txt
-
     CREW_MEMBER (5, "Crew Member"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fuse */
-// autogenerated using string template disenumpart2.txt
-
     FUSE (6, "Fuse"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Acquisition Sensor */
-// autogenerated using string template disenumpart2.txt
-
     ACQUISITION_SENSOR (7, "Acquisition Sensor"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tracking Sensor */
-// autogenerated using string template disenumpart2.txt
-
     TRACKING_SENSOR (8, "Tracking Sensor"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fuel Tank / Solid Rocket Motor */
-// autogenerated using string template disenumpart2.txt
-
-    FUEL_TANK_SOLID_ROCKET_MOTOR (9, "Fuel Tank / Solid Rocket Motor"),;
-
-// autogenerated using string template disenumpart25.txt
+    FUEL_TANK_SOLID_ROCKET_MOTOR (9, "Fuel Tank / Solid Rocket Motor");
 
     private int value;
     private final String description;
@@ -128,8 +83,6 @@ public enum EntityDamageStatusComponentIdentification
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityKind.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityKind.java
index 0861897917f1d20da5f469c6a4d054c89e205bfe..6ad54b1729f3f69ea1ad62a7319041d429cc3041 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityKind.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityKind.java
@@ -7,78 +7,33 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 7,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 7 marshal size 8<br>
  * EntityKind
  */
 public enum EntityKind 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Platform */
-// autogenerated using string template disenumpart2.txt
-
     PLATFORM (1, "Platform"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Munition */
-// autogenerated using string template disenumpart2.txt
-
     MUNITION (2, "Munition"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Life form */
-// autogenerated using string template disenumpart2.txt
-
     LIFE_FORM (3, "Life form"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Environmental */
-// autogenerated using string template disenumpart2.txt
-
     ENVIRONMENTAL (4, "Environmental"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cultural feature */
-// autogenerated using string template disenumpart2.txt
-
     CULTURAL_FEATURE (5, "Cultural feature"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Supply */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLY (6, "Supply"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Radio */
-// autogenerated using string template disenumpart2.txt
-
     RADIO (7, "Radio"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Expendable */
-// autogenerated using string template disenumpart2.txt
-
     EXPENDABLE (8, "Expendable"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sensor/Emitter */
-// autogenerated using string template disenumpart2.txt
-
-    SENSOR_EMITTER (9, "Sensor/Emitter"),;
-
-// autogenerated using string template disenumpart25.txt
+    SENSOR_EMITTER (9, "Sensor/Emitter");
 
     private int value;
     private final String description;
@@ -128,8 +83,6 @@ public enum EntityKind
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityMarkingCharacterSet.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityMarkingCharacterSet.java
index 81c358f1ab04eaf71464a7648152c13fde54e1f3..a04ee710513fc3d20e85e9b092f7df87a505c471 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityMarkingCharacterSet.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityMarkingCharacterSet.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 45,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 45 marshal size 8<br>
  * EntityMarkingCharacterSet
  */
 public enum EntityMarkingCharacterSet 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Unused */
-// autogenerated using string template disenumpart2.txt
-
     UNUSED (0, "Unused"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** ASCII */
-// autogenerated using string template disenumpart2.txt
-
     ASCII (1, "ASCII"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** U.S. Army Marking */
-// autogenerated using string template disenumpart2.txt
-
     US_ARMY_MARKING (2, "U.S. Army Marking"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Digit Chevron */
-// autogenerated using string template disenumpart2.txt
-
-    DIGIT_CHEVRON (3, "Digit Chevron"),;
-
-// autogenerated using string template disenumpart25.txt
+    DIGIT_CHEVRON (3, "Digit Chevron");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum EntityMarkingCharacterSet
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityVPRecordChangeIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityVPRecordChangeIndicator.java
index d6dcbd7ed14bd2f74f8b0249a5598b35eab06067..748ed139c870ee6f2af1058f7c3b6a5f8cf7fd8c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityVPRecordChangeIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityVPRecordChangeIndicator.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 320,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 320 marshal size 8<br>
  * EntityVPRecordChangeIndicator
  */
 public enum EntityVPRecordChangeIndicator 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Initial Report or No Change Since Last Issuance */
-// autogenerated using string template disenumpart2.txt
-
     INITIAL_REPORT_OR_NO_CHANGE_SINCE_LAST_ISSUANCE (0, "Initial Report or No Change Since Last Issuance"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Change Since Last Issuance */
-// autogenerated using string template disenumpart2.txt
-
-    CHANGE_SINCE_LAST_ISSUANCE (1, "Change Since Last Issuance"),;
-
-// autogenerated using string template disenumpart25.txt
+    CHANGE_SINCE_LAST_ISSUANCE (1, "Change Since Last Issuance");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum EntityVPRecordChangeIndicator
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentRecordTypeGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentRecordTypeGroups.java
index 7e6209c9b5e4737c4e03831ee9aeae7c2d1bb989..22935870021210ef42a16940194ef49d2ffb10e4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentRecordTypeGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentRecordTypeGroups.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 273,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 273 marshal size 8<br>
  * EnvironmentRecordTypeGroups
  */
 public enum EnvironmentRecordTypeGroups 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** State */
-// autogenerated using string template disenumpart2.txt
-
     STATE (0, "State"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Geometry */
-// autogenerated using string template disenumpart2.txt
-
-    GEOMETRY (1, "Geometry"),;
-
-// autogenerated using string template disenumpart25.txt
+    GEOMETRY (1, "Geometry");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum EnvironmentRecordTypeGroups
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessModelType.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessModelType.java
index 470a71cb0ee3d189d86ab3125e6a3f0139b256fb..16b7cddc5b55db2436d411bbd0996b65c4920852 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessModelType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessModelType.java
@@ -7,24 +7,15 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 248,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 248 marshal size 8<br>
  * EnvironmentalProcessModelType
  */
 public enum EnvironmentalProcessModelType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
-    NO_STATEMENT (0, "No Statement"),;
-
-// autogenerated using string template disenumpart25.txt
+    NO_STATEMENT (0, "No Statement");
 
     private int value;
     private final String description;
@@ -74,8 +65,6 @@ public enum EnvironmentalProcessModelType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalSubcategory.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalSubcategory.java
index 98df6907b78901013e86f1f619d39022fd2498c0..1db236acc8423be370086bc6ab19c40be7329963 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalSubcategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalSubcategory.java
@@ -7,54 +7,25 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 21,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 21 marshal size 8<br>
  * EnvironmentalSubcategory
  */
 public enum EnvironmentalSubcategory implements SubCategory
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Very Small */
-// autogenerated using string template disenumpart2.txt
-
     VERY_SMALL (20, "Very Small"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Small */
-// autogenerated using string template disenumpart2.txt
-
     SMALL (40, "Small"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "Medium"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Large */
-// autogenerated using string template disenumpart2.txt
-
     LARGE (80, "Large"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Very Large */
-// autogenerated using string template disenumpart2.txt
-
-    VERY_LARGE (100, "Very Large"),;
-
-// autogenerated using string template disenumpart25.txt
+    VERY_LARGE (100, "Very Large");
 
     private int value;
     private final String description;
@@ -104,8 +75,6 @@ public enum EnvironmentalSubcategory implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAirCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAirCategory.java
index c3863b65b1cc16d7523495e646e499d00d61bd65..1b7695d49fe2b65b497ad761a9ad96ed40bbc162 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAirCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAirCategory.java
@@ -7,90 +7,37 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 25,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 25 marshal size 8<br>
  * ExpendableAirCategory
  */
 public enum ExpendableAirCategory implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Chaff */
-// autogenerated using string template disenumpart2.txt
-
     CHAFF (1, "Chaff"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Flare */
-// autogenerated using string template disenumpart2.txt
-
     FLARE (2, "Flare"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Combined Chaff and Flare */
-// autogenerated using string template disenumpart2.txt
-
     COMBINED_CHAFF_AND_FLARE (3, "Combined Chaff and Flare"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Active Emitter */
-// autogenerated using string template disenumpart2.txt
-
     ACTIVE_EMITTER (4, "Active Emitter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Passive Decoy */
-// autogenerated using string template disenumpart2.txt
-
     PASSIVE_DECOY (5, "Passive Decoy"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Winged Decoy */
-// autogenerated using string template disenumpart2.txt
-
     WINGED_DECOY (6, "Winged Decoy"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Signal/Illumination Flare */
-// autogenerated using string template disenumpart2.txt
-
     SIGNAL_ILLUMINATION_FLARE (7, "Signal/Illumination Flare"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Smoke Generator */
-// autogenerated using string template disenumpart2.txt
-
     SMOKE_GENERATOR (8, "Smoke Generator"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Combined Flare and Smoke Generator */
-// autogenerated using string template disenumpart2.txt
-
     COMBINED_FLARE_AND_SMOKE_GENERATOR (12, "Combined Flare and Smoke Generator"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SAR Night Light (SRNL) */
-// autogenerated using string template disenumpart2.txt
-
     SAR_NIGHT_LIGHT_SRNL (13, "SAR Night Light (SRNL)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SAR Buoy */
-// autogenerated using string template disenumpart2.txt
-
-    SAR_BUOY (14, "SAR Buoy"),;
-
-// autogenerated using string template disenumpart25.txt
+    SAR_BUOY (14, "SAR Buoy");
 
     private int value;
     private final String description;
@@ -140,8 +87,6 @@ public enum ExpendableAirCategory implements Category
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSubsurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSubsurfaceCategory.java
index d92f2721b4a7929473602afaaa8549e599c52fa8..d2fa846e5633443ac1df382b9023ca275a832bec 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSubsurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSubsurfaceCategory.java
@@ -7,60 +7,27 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 27,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 27 marshal size 8<br>
  * ExpendableSubsurfaceCategory
  */
 public enum ExpendableSubsurfaceCategory implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Active emitter */
-// autogenerated using string template disenumpart2.txt
-
     ACTIVE_EMITTER (4, "Active emitter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Passive decoy */
-// autogenerated using string template disenumpart2.txt
-
     PASSIVE_DECOY (5, "Passive decoy"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Signal */
-// autogenerated using string template disenumpart2.txt
-
     SIGNAL (7, "Signal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Noise-Maker Decoy */
-// autogenerated using string template disenumpart2.txt
-
     NOISE_MAKER_DECOY (9, "Noise-Maker Decoy"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bubble-Maker Decoy */
-// autogenerated using string template disenumpart2.txt
-
     BUBBLE_MAKER_DECOY (10, "Bubble-Maker Decoy"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Multi-Mode Decoy */
-// autogenerated using string template disenumpart2.txt
-
-    MULTI_MODE_DECOY (11, "Multi-Mode Decoy"),;
-
-// autogenerated using string template disenumpart25.txt
+    MULTI_MODE_DECOY (11, "Multi-Mode Decoy");
 
     private int value;
     private final String description;
@@ -110,8 +77,6 @@ public enum ExpendableSubsurfaceCategory implements Category
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSurfaceCategory.java
index 554536cc09da8bfddc6b1a63127100723406a1c2..9814b45b7856b84cf0e3fa748fd5ba97fd401847 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSurfaceCategory.java
@@ -7,60 +7,27 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 26,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 26 marshal size 8<br>
  * ExpendableSurfaceCategory
  */
 public enum ExpendableSurfaceCategory implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Flare */
-// autogenerated using string template disenumpart2.txt
-
     FLARE (2, "Flare"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Active Emitter */
-// autogenerated using string template disenumpart2.txt
-
     ACTIVE_EMITTER (4, "Active Emitter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Passive Decoy */
-// autogenerated using string template disenumpart2.txt
-
     PASSIVE_DECOY (5, "Passive Decoy"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Smoke Generator */
-// autogenerated using string template disenumpart2.txt
-
     SMOKE_GENERATOR (8, "Smoke Generator"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Combined Flare and Smoke Generator */
-// autogenerated using string template disenumpart2.txt
-
     COMBINED_FLARE_AND_SMOKE_GENERATOR (12, "Combined Flare and Smoke Generator"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SAR Buoy */
-// autogenerated using string template disenumpart2.txt
-
-    SAR_BUOY (14, "SAR Buoy"),;
-
-// autogenerated using string template disenumpart25.txt
+    SAR_BUOY (14, "SAR Buoy");
 
     private int value;
     private final String description;
@@ -110,8 +77,6 @@ public enum ExpendableSurfaceCategory implements Category
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialGroups.java
index 06cb59c3d7273b74369e756d0bf4c40d7a2b0f58..c8a70a651432fa27960d0b15e99919a2a545802d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialGroups.java
@@ -7,60 +7,27 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 309,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 309 marshal size 8<br>
  * ExplosiveMaterialGroups
  */
 public enum ExplosiveMaterialGroups 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** General */
-// autogenerated using string template disenumpart2.txt
-
     GENERAL (0, "General"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Liquid - Aviation/Missile Fuels */
-// autogenerated using string template disenumpart2.txt
-
     LIQUID_AVIATION_MISSILE_FUELS (1, "Liquid - Aviation/Missile Fuels"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Liquid - Other Fuels */
-// autogenerated using string template disenumpart2.txt
-
     LIQUID_OTHER_FUELS (2, "Liquid - Other Fuels"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Liquid Explosive Material */
-// autogenerated using string template disenumpart2.txt
-
     LIQUID_EXPLOSIVE_MATERIAL (3, "Liquid Explosive Material"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Solid */
-// autogenerated using string template disenumpart2.txt
-
     SOLID (4, "Solid"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Gaseous */
-// autogenerated using string template disenumpart2.txt
-
     GASEOUS (5, "Gaseous"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dust Material */
-// autogenerated using string template disenumpart2.txt
-
-    DUST_MATERIAL (6, "Dust Material"),;
-
-// autogenerated using string template disenumpart25.txt
+    DUST_MATERIAL (6, "Dust Material");
 
     private int value;
     private final String description;
@@ -110,8 +77,6 @@ public enum ExplosiveMaterialGroups
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeColor.java b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeColor.java
index d9c2b99fe5602ca7d4a68d0477a3b4eff337c785..a8a085303e73a8df9dc10f49b0425dca2b397042 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeColor.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeColor.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 402,
- * marshal size 3,
+ * Generated from XML, <br>
+ * UID 402 marshal size 3<br>
  * FlareSmokeColor
  */
 public enum FlareSmokeColor 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** White */
-// autogenerated using string template disenumpart2.txt
-
     WHITE (0, "White"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Red */
-// autogenerated using string template disenumpart2.txt
-
     RED (1, "Red"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Green */
-// autogenerated using string template disenumpart2.txt
-
     GREEN (2, "Green"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** IR */
-// autogenerated using string template disenumpart2.txt
-
-    IR (3, "IR"),;
-
-// autogenerated using string template disenumpart25.txt
+    IR (3, "IR");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum FlareSmokeColor
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeStatus.java
index 74193d26ec210cb8984c9b108d5458c065429b25..b63efb2fa2355f076e3719eb115f66718d655d11 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeStatus.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 403,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 403 marshal size 2<br>
  * FlareSmokeStatus
  */
 public enum FlareSmokeStatus 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Ignited */
-// autogenerated using string template disenumpart2.txt
-
     NOT_IGNITED (0, "Not Ignited"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Burning */
-// autogenerated using string template disenumpart2.txt
-
     BURNING (1, "Burning"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Burned Out */
-// autogenerated using string template disenumpart2.txt
-
-    BURNED_OUT (2, "Burned Out"),;
-
-// autogenerated using string template disenumpart25.txt
+    BURNED_OUT (2, "Burned Out");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum FlareSmokeStatus
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ForceID.java b/src-generated/edu/nps/moves/dis7/enumerations/ForceID.java
index 0089d3d7893f332f707f940a582b191805dbff1b..caa5682fb89998cff5374a60569ea5a44f70d8a6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ForceID.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ForceID.java
@@ -7,204 +7,75 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 6,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 6 marshal size 8<br>
  * ForceID
  */
 public enum ForceID 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Friendly */
-// autogenerated using string template disenumpart2.txt
-
     FRIENDLY (1, "Friendly"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Opposing */
-// autogenerated using string template disenumpart2.txt
-
     OPPOSING (2, "Opposing"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Neutral */
-// autogenerated using string template disenumpart2.txt
-
     NEUTRAL (3, "Neutral"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Friendly 2 */
-// autogenerated using string template disenumpart2.txt
-
     FRIENDLY_2 (4, "Friendly 2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Opposing 2 */
-// autogenerated using string template disenumpart2.txt
-
     OPPOSING_2 (5, "Opposing 2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Neutral 2 */
-// autogenerated using string template disenumpart2.txt
-
     NEUTRAL_2 (6, "Neutral 2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Friendly 3 */
-// autogenerated using string template disenumpart2.txt
-
     FRIENDLY_3 (7, "Friendly 3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Opposing 3 */
-// autogenerated using string template disenumpart2.txt
-
     OPPOSING_3 (8, "Opposing 3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Neutral 3 */
-// autogenerated using string template disenumpart2.txt
-
     NEUTRAL_3 (9, "Neutral 3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Friendly 4 */
-// autogenerated using string template disenumpart2.txt
-
     FRIENDLY_4 (10, "Friendly 4"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Opposing 4 */
-// autogenerated using string template disenumpart2.txt
-
     OPPOSING_4 (11, "Opposing 4"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Neutral 4 */
-// autogenerated using string template disenumpart2.txt
-
     NEUTRAL_4 (12, "Neutral 4"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Friendly 5 */
-// autogenerated using string template disenumpart2.txt
-
     FRIENDLY_5 (13, "Friendly 5"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Opposing 5 */
-// autogenerated using string template disenumpart2.txt
-
     OPPOSING_5 (14, "Opposing 5"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Neutral 5 */
-// autogenerated using string template disenumpart2.txt
-
     NEUTRAL_5 (15, "Neutral 5"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Friendly 6 */
-// autogenerated using string template disenumpart2.txt
-
     FRIENDLY_6 (16, "Friendly 6"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Opposing 6 */
-// autogenerated using string template disenumpart2.txt
-
     OPPOSING_6 (17, "Opposing 6"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Neutral 6 */
-// autogenerated using string template disenumpart2.txt
-
     NEUTRAL_6 (18, "Neutral 6"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Friendly 7 */
-// autogenerated using string template disenumpart2.txt
-
     FRIENDLY_7 (19, "Friendly 7"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Opposing 7 */
-// autogenerated using string template disenumpart2.txt
-
     OPPOSING_7 (20, "Opposing 7"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Neutral 7 */
-// autogenerated using string template disenumpart2.txt
-
     NEUTRAL_7 (21, "Neutral 7"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Friendly 8 */
-// autogenerated using string template disenumpart2.txt
-
     FRIENDLY_8 (22, "Friendly 8"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Opposing 8 */
-// autogenerated using string template disenumpart2.txt
-
     OPPOSING_8 (23, "Opposing 8"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Neutral 8 */
-// autogenerated using string template disenumpart2.txt
-
     NEUTRAL_8 (24, "Neutral 8"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Friendly 9 */
-// autogenerated using string template disenumpart2.txt
-
     FRIENDLY_9 (25, "Friendly 9"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Opposing 9 */
-// autogenerated using string template disenumpart2.txt
-
     OPPOSING_9 (26, "Opposing 9"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Neutral 9 */
-// autogenerated using string template disenumpart2.txt
-
     NEUTRAL_9 (27, "Neutral 9"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Friendly 10 */
-// autogenerated using string template disenumpart2.txt
-
     IDENTIFICATION_FRIEND_OR_FOE (28, "Friendly 10"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Opposing 10 */
-// autogenerated using string template disenumpart2.txt
-
     OPPOSING_10 (29, "Opposing 10"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Neutral 10 */
-// autogenerated using string template disenumpart2.txt
-
-    SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Neutral 10"),;
-
-// autogenerated using string template disenumpart25.txt
+    SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Neutral 10");
 
     private int value;
     private final String description;
@@ -254,8 +125,6 @@ public enum ForceID
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FormatType.java b/src-generated/edu/nps/moves/dis7/enumerations/FormatType.java
index b164ab7795456ce847b438de65dcfde055b08a72..76a98012483ae78c79a853e53896e680b828c8a0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FormatType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FormatType.java
@@ -7,102 +7,41 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 363,
- * marshal size 5,
+ * Generated from XML, <br>
+ * UID 363 marshal size 5<br>
  * FormatType
  */
 public enum FormatType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Data */
-// autogenerated using string template disenumpart2.txt
-
     NO_DATA (0, "No Data"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Identity Format */
-// autogenerated using string template disenumpart2.txt
-
     IDENTITY_FORMAT (4, "Identity Format"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Surface Format, 5 meter RNP */
-// autogenerated using string template disenumpart2.txt
-
     SURFACE_FORMAT_5_METER_RNP (5, "Surface Format, 5 meter RNP"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Surface Format, 100 meter RNP */
-// autogenerated using string template disenumpart2.txt
-
     SURFACE_FORMAT_100_METER_RNP (6, "Surface Format, 100 meter RNP"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Airborne Format, 5 meter RNP, 25-foot Barometric Altitude */
-// autogenerated using string template disenumpart2.txt
-
     AIRBORNE_FORMAT_5_METER_RNP_25_FOOT_BAROMETRIC_ALTITUDE (7, "Airborne Format, 5 meter RNP, 25-foot Barometric Altitude"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Airborne Format, 100 meter RNP, 25-foot Barometric Altitude */
-// autogenerated using string template disenumpart2.txt
-
     AIRBORNE_FORMAT_100_METER_RNP_25_FOOT_BAROMETRIC_ALTITUDE (8, "Airborne Format, 100 meter RNP, 25-foot Barometric Altitude"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Airborne Format, 0.25 nmi RNP, 25-foot Barometric Altitude */
-// autogenerated using string template disenumpart2.txt
-
     AIRBORNE_FORMAT_025_NMI_RNP_25_FOOT_BAROMETRIC_ALTITUDE (9, "Airborne Format, 0.25 nmi RNP, 25-foot Barometric Altitude"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Airborne Format, 1.0 nmi RNP, 25-foot Barometric Altitude */
-// autogenerated using string template disenumpart2.txt
-
     AIRBORNE_FORMAT_10_NMI_RNP_25_FOOT_BAROMETRIC_ALTITUDE (10, "Airborne Format, 1.0 nmi RNP, 25-foot Barometric Altitude"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Airborne Format, 5 meter RNP, 100-foot Barometric Altitude */
-// autogenerated using string template disenumpart2.txt
-
     AIRBORNE_FORMAT_5_METER_RNP_100_FOOT_BAROMETRIC_ALTITUDE (11, "Airborne Format, 5 meter RNP, 100-foot Barometric Altitude"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Airborne Format, 100 meter RNP, 100-foot Barometric Altitude */
-// autogenerated using string template disenumpart2.txt
-
     AIRBORNE_FORMAT_100_METER_RNP_100_FOOT_BAROMETRIC_ALTITUDE (12, "Airborne Format, 100 meter RNP, 100-foot Barometric Altitude"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Airborne Format, 0.25 nmi RNP, 100-foot Barometric Altitude */
-// autogenerated using string template disenumpart2.txt
-
     AIRBORNE_FORMAT_025_NMI_RNP_100_FOOT_BAROMETRIC_ALTITUDE (13, "Airborne Format, 0.25 nmi RNP, 100-foot Barometric Altitude"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Airborne Format, 1.0 nmi RNP, 100-foot Barometric Altitude */
-// autogenerated using string template disenumpart2.txt
-
     AIRBORNE_FORMAT_10_NMI_RNP_100_FOOT_BAROMETRIC_ALTITUDE (14, "Airborne Format, 1.0 nmi RNP, 100-foot Barometric Altitude"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Airborne Format, 5 meter RNP, GPS Height */
-// autogenerated using string template disenumpart2.txt
-
     AIRBORNE_FORMAT_5_METER_RNP_GPS_HEIGHT (15, "Airborne Format, 5 meter RNP, GPS Height"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Airborne Format, 100 meter RNP, GPS Height */
-// autogenerated using string template disenumpart2.txt
-
-    AIRBORNE_FORMAT_100_METER_RNP_GPS_HEIGHT (16, "Airborne Format, 100 meter RNP, GPS Height"),;
-
-// autogenerated using string template disenumpart25.txt
+    AIRBORNE_FORMAT_100_METER_RNP_GPS_HEIGHT (16, "Airborne Format, 100 meter RNP, GPS Height");
 
     private int value;
     private final String description;
@@ -152,8 +91,6 @@ public enum FormatType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FuelLocation.java b/src-generated/edu/nps/moves/dis7/enumerations/FuelLocation.java
index 36ca6afc2354fe969cf98e173ba2b1a5c349002e..0351858f60c8036049df7b9a027be1d320b3a47b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FuelLocation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FuelLocation.java
@@ -7,24 +7,15 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 329,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 329 marshal size 8<br>
  * FuelLocation
  */
 public enum FuelLocation 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
-    OTHER (0, "Other"),;
-
-// autogenerated using string template disenumpart25.txt
+    OTHER (0, "Other");
 
     private int value;
     private final String description;
@@ -74,8 +65,6 @@ public enum FuelLocation
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FuelMeasurementUnits.java b/src-generated/edu/nps/moves/dis7/enumerations/FuelMeasurementUnits.java
index 584941deec547431666132a4c0e7a7281a27e128..f63a7fbdb1a22fc34aff408e30952a4aa5b390fb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FuelMeasurementUnits.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FuelMeasurementUnits.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 328,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 328 marshal size 8<br>
  * FuelMeasurementUnits
  */
 public enum FuelMeasurementUnits 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Liter */
-// autogenerated using string template disenumpart2.txt
-
     LITER (1, "Liter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Kilogram */
-// autogenerated using string template disenumpart2.txt
-
-    KILOGRAM (2, "Kilogram"),;
-
-// autogenerated using string template disenumpart25.txt
+    KILOGRAM (2, "Kilogram");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum FuelMeasurementUnits
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GridAxisDescriptorAxisType.java b/src-generated/edu/nps/moves/dis7/enumerations/GridAxisDescriptorAxisType.java
index 5d00e052a2d1cb9efc6ddcf3e9515787625dd040..d6cd34a8b9389c8016ac42068346f9948ebf2b08 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GridAxisDescriptorAxisType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GridAxisDescriptorAxisType.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 377,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 377 marshal size 8<br>
  * GridAxisDescriptorAxisType
  */
 public enum GridAxisDescriptorAxisType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Regular Axis */
-// autogenerated using string template disenumpart2.txt
-
     REGULAR_AXIS (0, "Regular Axis"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Irregular Axis */
-// autogenerated using string template disenumpart2.txt
-
-    IRREGULAR_AXIS (1, "Irregular Axis"),;
-
-// autogenerated using string template disenumpart25.txt
+    IRREGULAR_AXIS (1, "Irregular Axis");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum GridAxisDescriptorAxisType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataConstantGrid.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataConstantGrid.java
index 620c32cab2968fd949570cd44b551ac7ac96ddf6..bd2ac0adcfe76734e89ad8bd00c3aa9658b9bcda 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataConstantGrid.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataConstantGrid.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 245,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 245 marshal size 8<br>
  * GriddedDataConstantGrid
  */
 public enum GriddedDataConstantGrid 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Constant grid */
-// autogenerated using string template disenumpart2.txt
-
     CONSTANT_GRID (0, "Constant grid"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Updated grid */
-// autogenerated using string template disenumpart2.txt
-
-    UPDATED_GRID (1, "Updated grid"),;
-
-// autogenerated using string template disenumpart25.txt
+    UPDATED_GRID (1, "Updated grid");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum GriddedDataConstantGrid
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/HighDensityTrackJam.java b/src-generated/edu/nps/moves/dis7/enumerations/HighDensityTrackJam.java
index 3b3630e6810456d4f2d4728b8974135f55771e71..468ce13b043e1e47525ec8d634debd3dae2d02f3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/HighDensityTrackJam.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/HighDensityTrackJam.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 79,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 79 marshal size 8<br>
  * HighDensityTrackJam
  */
 public enum HighDensityTrackJam 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Selected */
-// autogenerated using string template disenumpart2.txt
-
     NOT_SELECTED (0, "Not Selected"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Selected */
-// autogenerated using string template disenumpart2.txt
-
-    SELECTED (1, "Selected"),;
-
-// autogenerated using string template disenumpart25.txt
+    SELECTED (1, "Selected");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum HighDensityTrackJam
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java
index ae772b2049075d2b1871e1d1cf1a6b3a23dc10e6..280063b27f6b892dd5575a266a283671965a856f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 297,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 297 marshal size 8<br>
  * HighFidelityHAVEQUICKTODTransmitIndicator
  */
 public enum HighFidelityHAVEQUICKTODTransmitIndicator 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No TOD Is Being Transmitted */
-// autogenerated using string template disenumpart2.txt
-
     NO_TOD_IS_BEING_TRANSMITTED (0, "No TOD Is Being Transmitted"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** TOD Transmission in Progress */
-// autogenerated using string template disenumpart2.txt
-
-    TOD_TRANSMISSION_IN_PROGRESS (1, "TOD Transmission in Progress"),;
-
-// autogenerated using string template disenumpart25.txt
+    TOD_TRANSMISSION_IN_PROGRESS (1, "TOD Transmission in Progress");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum HighFidelityHAVEQUICKTODTransmitIndicator
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFAlternateMode4ChallengeReply.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFAlternateMode4ChallengeReply.java
index 46367933e39fbbe30b972dacef75da7263e9886a..45cd5e76707da3a71a0884b5e1a17e1137e26903 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFAlternateMode4ChallengeReply.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFAlternateMode4ChallengeReply.java
@@ -7,48 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 96,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 96 marshal size 8<br>
  * IFFAlternateMode4ChallengeReply
  */
 public enum IFFAlternateMode4ChallengeReply 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Valid */
-// autogenerated using string template disenumpart2.txt
-
     VALID (1, "Valid"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Invalid */
-// autogenerated using string template disenumpart2.txt
-
     INVALID (2, "Invalid"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No response */
-// autogenerated using string template disenumpart2.txt
-
     NO_RESPONSE (3, "No response"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Unable to Verify */
-// autogenerated using string template disenumpart2.txt
-
-    UNABLE_TO_VERIFY (4, "Unable to Verify"),;
-
-// autogenerated using string template disenumpart25.txt
+    UNABLE_TO_VERIFY (4, "Unable to Verify");
 
     private int value;
     private final String description;
@@ -98,8 +73,6 @@ public enum IFFAlternateMode4ChallengeReply
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFApplicableModes.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFApplicableModes.java
index 6f514d31718201383fb4c06e81748bd0362fa6b1..e7dc7ff1007f80f738a5aa67a329564260a267e3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFApplicableModes.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFApplicableModes.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 339,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 339 marshal size 8<br>
  * IFFApplicableModes
  */
 public enum IFFApplicableModes 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Applicable Modes Data */
-// autogenerated using string template disenumpart2.txt
-
     NO_APPLICABLE_MODES_DATA (0, "No Applicable Modes Data"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** All Modes */
-// autogenerated using string template disenumpart2.txt
-
-    ALL_MODES (1, "All Modes"),;
-
-// autogenerated using string template disenumpart25.txt
+    ALL_MODES (1, "All Modes");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum IFFApplicableModes
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFDataRecordAvailable.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFDataRecordAvailable.java
index ea93c7b691251302a82eaea26f4252230aee994c..3249c7e6542cfe931d8aba1dbeea0e53f36a67e7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFDataRecordAvailable.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFDataRecordAvailable.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 360,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 360 marshal size 1<br>
  * IFFDataRecordAvailable
  */
 public enum IFFDataRecordAvailable 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Compute Locally */
-// autogenerated using string template disenumpart2.txt
-
     COMPUTE_LOCALLY (0, "Compute Locally"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** IFF Data Record Available */
-// autogenerated using string template disenumpart2.txt
-
-    IFF_DATA_RECORD_AVAILABLE (1, "IFF Data Record Available"),;
-
-// autogenerated using string template disenumpart25.txt
+    IFF_DATA_RECORD_AVAILABLE (1, "IFF Data Record Available");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum IFFDataRecordAvailable
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFLayerSpecificInformation.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFLayerSpecificInformation.java
index 4f31406cadcfc4059f96bec9b467f6e0be3d36b1..970c065477b8ecf8cf5a451b56d1267e2de242e7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFLayerSpecificInformation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFLayerSpecificInformation.java
@@ -7,24 +7,15 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 87,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 87 marshal size 8<br>
  * IFFLayerSpecificInformation
  */
 public enum IFFLayerSpecificInformation 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Layer-Specific Information Is Present */
-// autogenerated using string template disenumpart2.txt
-
-    NO_LAYER_SPECIFIC_INFORMATION_IS_PRESENT (0, "No Layer-Specific Information Is Present"),;
-
-// autogenerated using string template disenumpart25.txt
+    NO_LAYER_SPECIFIC_INFORMATION_IS_PRESENT (0, "No Layer-Specific Information Is Present");
 
     private int value;
     private final String description;
@@ -74,8 +65,6 @@ public enum IFFLayerSpecificInformation
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSimulationMode.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSimulationMode.java
index 92492eb4057788eda13fcf360d46e304c988fe33..5df10ee9c98994cedc11f335b1de1dd1900743ae 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSimulationMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSimulationMode.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 338,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 338 marshal size 1<br>
  * IFFSimulationMode
  */
 public enum IFFSimulationMode 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Regeneration */
-// autogenerated using string template disenumpart2.txt
-
     REGENERATION (0, "Regeneration"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Interactive */
-// autogenerated using string template disenumpart2.txt
-
-    INTERACTIVE (1, "Interactive"),;
-
-// autogenerated using string template disenumpart25.txt
+    INTERACTIVE (1, "Interactive");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum IFFSimulationMode
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemMode.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemMode.java
index ce763f1dade994278ab0939cde1e5739fccbc65b..5a597a2f8ff613e5b3131e4a95b22efb934786d6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemMode.java
@@ -7,54 +7,25 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 84,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 84 marshal size 8<br>
  * IFFSystemMode
  */
 public enum IFFSystemMode 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Off */
-// autogenerated using string template disenumpart2.txt
-
     OFF (1, "Off"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Standby */
-// autogenerated using string template disenumpart2.txt
-
     STANDBY (2, "Standby"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Normal */
-// autogenerated using string template disenumpart2.txt
-
     NORMAL (3, "Normal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Emergency */
-// autogenerated using string template disenumpart2.txt
-
     EMERGENCY (4, "Emergency"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Low or Low Sensitivity */
-// autogenerated using string template disenumpart2.txt
-
-    LOW_OR_LOW_SENSITIVITY (5, "Low or Low Sensitivity"),;
-
-// autogenerated using string template disenumpart25.txt
+    LOW_OR_LOW_SENSITIVITY (5, "Low or Low Sensitivity");
 
     private int value;
     private final String description;
@@ -104,8 +75,6 @@ public enum IFFSystemMode
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter1.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter1.java
index def56322c92f224c59b63865a96aba08c55eb70f..a86d3a9392998b4fef8bc255391111482a554188 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter1.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter1.java
@@ -7,24 +7,15 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 97,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 97 marshal size 8<br>
  * IFFSystemType1OperationalParameter1
  */
 public enum IFFSystemType1OperationalParameter1 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Operational Parameter 1 Data */
-// autogenerated using string template disenumpart2.txt
-
-    NO_OPERATIONAL_PARAMETER_1_DATA (0, "No Operational Parameter 1 Data"),;
-
-// autogenerated using string template disenumpart25.txt
+    NO_OPERATIONAL_PARAMETER_1_DATA (0, "No Operational Parameter 1 Data");
 
     private int value;
     private final String description;
@@ -74,8 +65,6 @@ public enum IFFSystemType1OperationalParameter1
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter2.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter2.java
index edd5438826b8a59c8e7b0f3ae87b035e38ab135a..c08c6749d102c68224169e46342a30a4b34ed422 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter2.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter2.java
@@ -7,24 +7,15 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 98,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 98 marshal size 8<br>
  * IFFSystemType1OperationalParameter2
  */
 public enum IFFSystemType1OperationalParameter2 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Operational Parameter 2 Data */
-// autogenerated using string template disenumpart2.txt
-
-    NO_OPERATIONAL_PARAMETER_2_DATA (0, "No Operational Parameter 2 Data"),;
-
-// autogenerated using string template disenumpart25.txt
+    NO_OPERATIONAL_PARAMETER_2_DATA (0, "No Operational Parameter 2 Data");
 
     private int value;
     private final String description;
@@ -74,8 +65,6 @@ public enum IFFSystemType1OperationalParameter2
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOCommsNodeRecordCommsNodeType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOCommsNodeRecordCommsNodeType.java
index c86d8ea20d310c60f70445e89e9d40a563904b63..5f2beab989677afcfe02e9b4e034a59e3ddac5d2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOCommsNodeRecordCommsNodeType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOCommsNodeRecordCommsNodeType.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 294,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 294 marshal size 8<br>
  * IOCommsNodeRecordCommsNodeType
  */
 public enum IOCommsNodeRecordCommsNodeType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sender Node ID */
-// autogenerated using string template disenumpart2.txt
-
     SENDER_NODE_ID (1, "Sender Node ID"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Receiver Node ID */
-// autogenerated using string template disenumpart2.txt
-
     RECEIVER_NODE_ID (2, "Receiver Node ID"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sender/Receiver Node ID */
-// autogenerated using string template disenumpart2.txt
-
-    SENDER_RECEIVER_NODE_ID (3, "Sender/Receiver Node ID"),;
-
-// autogenerated using string template disenumpart25.txt
+    SENDER_RECEIVER_NODE_ID (3, "Sender/Receiver Node ID");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum IOCommsNodeRecordCommsNodeType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOEffect.java b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOEffect.java
index 20c036caea1258328e0e839a7c6d9f4c78e1c3ea..a2e55b9501260b614e3ebf053359772b599fa6a3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOEffect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOEffect.java
@@ -7,48 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 292,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 292 marshal size 8<br>
  * IOEffectsRecordIOEffect
  */
 public enum IOEffectsRecordIOEffect 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Denial */
-// autogenerated using string template disenumpart2.txt
-
     DENIAL (1, "Denial"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Degradation */
-// autogenerated using string template disenumpart2.txt
-
     DEGRADATION (2, "Degradation"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Disruption */
-// autogenerated using string template disenumpart2.txt
-
     DISRUPTION (3, "Disruption"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Terminate Effect */
-// autogenerated using string template disenumpart2.txt
-
-    TERMINATE_EFFECT (255, "Terminate Effect"),;
-
-// autogenerated using string template disenumpart25.txt
+    TERMINATE_EFFECT (255, "Terminate Effect");
 
     private int value;
     private final String description;
@@ -98,8 +73,6 @@ public enum IOEffectsRecordIOEffect
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOLinkType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOLinkType.java
index a2da8f844a00973ece370957991666e11da5d8cd..b3df13be441c7ca3f5b594fa8939b49a2c1510a2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOLinkType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOLinkType.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 291,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 291 marshal size 8<br>
  * IOEffectsRecordIOLinkType
  */
 public enum IOEffectsRecordIOLinkType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Logical Link */
-// autogenerated using string template disenumpart2.txt
-
     LOGICAL_LINK (1, "Logical Link"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Physical Node */
-// autogenerated using string template disenumpart2.txt
-
     PHYSICAL_NODE (2, "Physical Node"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Physical Link */
-// autogenerated using string template disenumpart2.txt
-
-    PHYSICAL_LINK (3, "Physical Link"),;
-
-// autogenerated using string template disenumpart25.txt
+    PHYSICAL_LINK (3, "Physical Link");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum IOEffectsRecordIOLinkType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOStatus.java
index 2c1eaf8108c13fa37b14ff9eeea0637f47757ae8..8c1e2bb12f05a78e9082b8281367bffc8325960c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOStatus.java
@@ -7,66 +7,29 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 290,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 290 marshal size 8<br>
  * IOEffectsRecordIOStatus
  */
 public enum IOEffectsRecordIOStatus 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Effect on Sender */
-// autogenerated using string template disenumpart2.txt
-
     EFFECT_ON_SENDER (1, "Effect on Sender"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Effect on Receiver */
-// autogenerated using string template disenumpart2.txt
-
     EFFECT_ON_RECEIVER (2, "Effect on Receiver"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Effect on Sender and Receiver */
-// autogenerated using string template disenumpart2.txt
-
     EFFECT_ON_SENDER_AND_RECEIVER (3, "Effect on Sender and Receiver"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Effect on Message */
-// autogenerated using string template disenumpart2.txt
-
     EFFECT_ON_MESSAGE (4, "Effect on Message"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Effect on Sender and Message */
-// autogenerated using string template disenumpart2.txt
-
     EFFECT_ON_SENDER_AND_MESSAGE (5, "Effect on Sender and Message"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Effect on Receiver and Message */
-// autogenerated using string template disenumpart2.txt
-
     EFFECT_ON_RECEIVER_AND_MESSAGE (6, "Effect on Receiver and Message"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Effect on Sender, Receiver, and Message */
-// autogenerated using string template disenumpart2.txt
-
-    EFFECT_ON_SENDER_RECEIVER_AND_MESSAGE (7, "Effect on Sender, Receiver, and Message"),;
-
-// autogenerated using string template disenumpart25.txt
+    EFFECT_ON_SENDER_RECEIVER_AND_MESSAGE (7, "Effect on Sender, Receiver, and Message");
 
     private int value;
     private final String description;
@@ -116,8 +79,6 @@ public enum IOEffectsRecordIOStatus
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOReportIOReportType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOReportIOReportType.java
index bc56a7123f4857295891beb0447853e65ce84127..71252523d37e7223bbb5eea44b64c642f785746f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOReportIOReportType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOReportIOReportType.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 289,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 289 marshal size 8<br>
  * IOReportIOReportType
  */
 public enum IOReportIOReportType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Initial Report */
-// autogenerated using string template disenumpart2.txt
-
     INITIAL_REPORT (1, "Initial Report"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Update Report */
-// autogenerated using string template disenumpart2.txt
-
     UPDATE_REPORT (2, "Update Report"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Final Report */
-// autogenerated using string template disenumpart2.txt
-
-    FINAL_REPORT (3, "Final Report"),;
-
-// autogenerated using string template disenumpart25.txt
+    FINAL_REPORT (3, "Final Report");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum IOReportIOReportType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ISLSAntennaType.java b/src-generated/edu/nps/moves/dis7/enumerations/ISLSAntennaType.java
index 25566c77726657ca9a4827e7eea04679d8c43b57..973a39dd61877a41ef839cb877b0492ee4ef2fc0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ISLSAntennaType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ISLSAntennaType.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 349,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 349 marshal size 8<br>
  * ISLSAntennaType
  */
 public enum ISLSAntennaType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Monopulse Antenna */
-// autogenerated using string template disenumpart2.txt
-
-    MONOPULSE_ANTENNA (1, "Monopulse Antenna"),;
-
-// autogenerated using string template disenumpart25.txt
+    MONOPULSE_ANTENNA (1, "Monopulse Antenna");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum ISLSAntennaType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommand.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommand.java
index 8f6d9fd42e49a992cb27dfeaf2e767f12d0b6c05..0f196d6f0eb0bf40c19b2d03fb2a3a0aa460397a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommand.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommand.java
@@ -7,60 +7,27 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 182,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 182 marshal size 8<br>
  * IntercomControlCommand
  */
 public enum IntercomControlCommand 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Command */
-// autogenerated using string template disenumpart2.txt
-
     NO_COMMAND (0, "No Command"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Status */
-// autogenerated using string template disenumpart2.txt
-
     STATUS (1, "Status"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Connect */
-// autogenerated using string template disenumpart2.txt
-
     CONNECT (2, "Connect"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Disconnect */
-// autogenerated using string template disenumpart2.txt
-
     DISCONNECT (3, "Disconnect"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Reset */
-// autogenerated using string template disenumpart2.txt
-
     RESET (4, "Reset"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** On */
-// autogenerated using string template disenumpart2.txt
-
     ON (5, "On"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Off */
-// autogenerated using string template disenumpart2.txt
-
-    OFF (6, "Off"),;
-
-// autogenerated using string template disenumpart25.txt
+    OFF (6, "Off");
 
     private int value;
     private final String description;
@@ -110,8 +77,6 @@ public enum IntercomControlCommand
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsClass.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsClass.java
index 6b9e46279734a820ef7346e204183069b307cf24..d9b52574bf515d49d859b59b99a418ca9a008c0a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsClass.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 416,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 416 marshal size 1<br>
  * IntercomControlCommunicationsClass
  */
 public enum IntercomControlCommunicationsClass 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Simulated Communications Channel */
-// autogenerated using string template disenumpart2.txt
-
     SIMULATED_COMMUNICATIONS_CHANNEL (0, "Simulated Communications Channel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Simulation Support Communications Channel */
-// autogenerated using string template disenumpart2.txt
-
-    SIMULATION_SUPPORT_COMMUNICATIONS_CHANNEL (1, "Simulation Support Communications Channel"),;
-
-// autogenerated using string template disenumpart25.txt
+    SIMULATION_SUPPORT_COMMUNICATIONS_CHANNEL (1, "Simulation Support Communications Channel");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum IntercomControlCommunicationsClass
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsType.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsType.java
index 6c6b3fccca3b2884316919215b3ba60270c52304..84cdeb8d7cef76e9442951c252e2aa398aa17368 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsType.java
@@ -7,48 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 181,
- * marshal size 7,
+ * Generated from XML, <br>
+ * UID 181 marshal size 7<br>
  * IntercomControlCommunicationsType
  */
 public enum IntercomControlCommunicationsType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Reserved */
-// autogenerated using string template disenumpart2.txt
-
     RESERVED (0, "Reserved"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Connection FDX */
-// autogenerated using string template disenumpart2.txt
-
     CONNECTION_FDX (1, "Connection FDX"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Connection HDX - Destination is Receive Only */
-// autogenerated using string template disenumpart2.txt
-
     CONNECTION_HDX_DESTINATION_IS_RECEIVE_ONLY (2, "Connection HDX - Destination is Receive Only"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Connection HDX - Destination is Transmit Only */
-// autogenerated using string template disenumpart2.txt
-
     CONNECTION_HDX_DESTINATION_IS_TRANSMIT_ONLY (3, "Connection HDX - Destination is Transmit Only"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Connection HDX */
-// autogenerated using string template disenumpart2.txt
-
-    CONNECTION_HDX (4, "Connection HDX"),;
-
-// autogenerated using string template disenumpart25.txt
+    CONNECTION_HDX (4, "Connection HDX");
 
     private int value;
     private final String description;
@@ -98,8 +73,6 @@ public enum IntercomControlCommunicationsType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlControlType.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlControlType.java
index 186714067cc172b63770cdcacaa9ed8be32b1373..84a3cd18d94c778618f6afecf0da4e72f8eb660d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlControlType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlControlType.java
@@ -7,54 +7,25 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 180,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 180 marshal size 8<br>
  * IntercomControlControlType
  */
 public enum IntercomControlControlType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Reserved */
-// autogenerated using string template disenumpart2.txt
-
     RESERVED (0, "Reserved"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Status */
-// autogenerated using string template disenumpart2.txt
-
     STATUS (1, "Status"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Request - Acknowledge Required */
-// autogenerated using string template disenumpart2.txt
-
     REQUEST_ACKNOWLEDGE_REQUIRED (2, "Request - Acknowledge Required"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Request - No Acknowledge */
-// autogenerated using string template disenumpart2.txt
-
     REQUEST_NO_ACKNOWLEDGE (3, "Request - No Acknowledge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ack - Request Granted */
-// autogenerated using string template disenumpart2.txt
-
     ACK_REQUEST_GRANTED (4, "Ack - Request Granted"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Nack - Request Denied */
-// autogenerated using string template disenumpart2.txt
-
-    NACK_REQUEST_DENIED (5, "Nack - Request Denied"),;
-
-// autogenerated using string template disenumpart25.txt
+    NACK_REQUEST_DENIED (5, "Nack - Request Denied");
 
     private int value;
     private final String description;
@@ -104,8 +75,6 @@ public enum IntercomControlControlType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlDestinationLineStateCommand.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlDestinationLineStateCommand.java
index f303b1639bc74dd1f8e80eb97e119a46d8428f12..f1099ba0ab2d7429c1437cbc9e2affa3e05d1a38 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlDestinationLineStateCommand.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlDestinationLineStateCommand.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 184,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 184 marshal size 8<br>
  * IntercomControlDestinationLineStateCommand
  */
 public enum IntercomControlDestinationLineStateCommand 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** None */
-// autogenerated using string template disenumpart2.txt
-
     NONE (0, "None"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Set Line State - Transmitting */
-// autogenerated using string template disenumpart2.txt
-
     SET_LINE_STATE_TRANSMITTING (1, "Set Line State - Transmitting"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Set Line State - Not Transmitting */
-// autogenerated using string template disenumpart2.txt
-
     SET_LINE_STATE_NOT_TRANSMITTING (2, "Set Line State - Not Transmitting"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Return to Local Line State Control */
-// autogenerated using string template disenumpart2.txt
-
-    RETURN_TO_LOCAL_LINE_STATE_CONTROL (3, "Return to Local Line State Control"),;
-
-// autogenerated using string template disenumpart25.txt
+    RETURN_TO_LOCAL_LINE_STATE_CONTROL (3, "Return to Local Line State Control");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum IntercomControlDestinationLineStateCommand
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlTransmitLineState.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlTransmitLineState.java
index aed951cac6ab0fafc326af639f236c092c608eb5..cca3c4345a90a09468370eb9b15ee608187e0a1c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlTransmitLineState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlTransmitLineState.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 183,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 183 marshal size 8<br>
  * IntercomControlTransmitLineState
  */
 public enum IntercomControlTransmitLineState 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Transmit Line State not applicable */
-// autogenerated using string template disenumpart2.txt
-
     TRANSMIT_LINE_STATE_NOT_APPLICABLE (0, "Transmit Line State not applicable"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Transmitting */
-// autogenerated using string template disenumpart2.txt
-
     NOT_TRANSMITTING (1, "Not Transmitting"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Transmitting */
-// autogenerated using string template disenumpart2.txt
-
-    TRANSMITTING (2, "Transmitting"),;
-
-// autogenerated using string template disenumpart25.txt
+    TRANSMITTING (2, "Transmitting");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum IntercomControlTransmitLineState
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfGroupedEntityCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfGroupedEntityCategory.java
index 74e0a2a090c981e41a56340f4bb8de63c6235281..3b0467b8195e1f8758328d134068b249b0986d17 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfGroupedEntityCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfGroupedEntityCategory.java
@@ -7,78 +7,33 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 213,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 213 marshal size 8<br>
  * IsGroupOfGroupedEntityCategory
  */
 public enum IsGroupOfGroupedEntityCategory implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Undefined */
-// autogenerated using string template disenumpart2.txt
-
     UNDEFINED (0, "Undefined"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Basic Ground Combat Vehicle */
-// autogenerated using string template disenumpart2.txt
-
     BASIC_GROUND_COMBAT_VEHICLE (1, "Basic Ground Combat Vehicle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Enhanced Ground Combat Vehicle */
-// autogenerated using string template disenumpart2.txt
-
     ENHANCED_GROUND_COMBAT_VEHICLE (2, "Enhanced Ground Combat Vehicle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Basic Ground Combat Soldier */
-// autogenerated using string template disenumpart2.txt
-
     BASIC_GROUND_COMBAT_SOLDIER (3, "Basic Ground Combat Soldier"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Enhanced Ground Combat Soldier */
-// autogenerated using string template disenumpart2.txt
-
     ENHANCED_GROUND_COMBAT_SOLDIER (4, "Enhanced Ground Combat Soldier"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Basic Rotor Wing Aircraft */
-// autogenerated using string template disenumpart2.txt
-
     BASIC_ROTOR_WING_AIRCRAFT (5, "Basic Rotor Wing Aircraft"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Enhanced Rotor Wing Aircraft */
-// autogenerated using string template disenumpart2.txt
-
     ENHANCED_ROTOR_WING_AIRCRAFT (6, "Enhanced Rotor Wing Aircraft"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Basic Fixed Wing Aircraft */
-// autogenerated using string template disenumpart2.txt
-
     BASIC_FIXED_WING_AIRCRAFT (7, "Basic Fixed Wing Aircraft"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Enhanced Fixed Wing Aircraft */
-// autogenerated using string template disenumpart2.txt
-
     ENHANCED_FIXED_WING_AIRCRAFT (8, "Enhanced Fixed Wing Aircraft"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ground Logistics Vehicle */
-// autogenerated using string template disenumpart2.txt
-
-    GROUND_LOGISTICS_VEHICLE (9, "Ground Logistics Vehicle"),;
-
-// autogenerated using string template disenumpart25.txt
+    GROUND_LOGISTICS_VEHICLE (9, "Ground Logistics Vehicle");
 
     private int value;
     private final String description;
@@ -128,8 +83,6 @@ public enum IsGroupOfGroupedEntityCategory implements Category
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfRestStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfRestStatus.java
index 3a797969b9c62fdb4b8bece755e36db08649ab0d..cc03f787829fce0b6da3ab20ee91f5f3c89f2922 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfRestStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfRestStatus.java
@@ -7,72 +7,31 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 214,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 214 marshal size 8<br>
  * IsGroupOfRestStatus
  */
 public enum IsGroupOfRestStatus 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not rested (Has not slept in the last three days) */
-// autogenerated using string template disenumpart2.txt
-
     NOT_RESTED_HAS_NOT_SLEPT_IN_THE_LAST_THREE_DAYS (0, "Not rested (Has not slept in the last three days)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Has slept an average of 1 hour per day in the last three days. */
-// autogenerated using string template disenumpart2.txt
-
     HAS_SLEPT_AN_AVERAGE_OF_1_HOUR_PER_DAY_IN_THE_LAST_THREE_DAYS (1, "Has slept an average of 1 hour per day in the last three days."),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Has slept an average of 2 hours per day in the last three days. */
-// autogenerated using string template disenumpart2.txt
-
     HAS_SLEPT_AN_AVERAGE_OF_2_HOURS_PER_DAY_IN_THE_LAST_THREE_DAYS (2, "Has slept an average of 2 hours per day in the last three days."),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Has slept an average of 3 hours per day in the last three days. */
-// autogenerated using string template disenumpart2.txt
-
     HAS_SLEPT_AN_AVERAGE_OF_3_HOURS_PER_DAY_IN_THE_LAST_THREE_DAYS (3, "Has slept an average of 3 hours per day in the last three days."),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Has slept an average of 4 hours per day in the last three days. */
-// autogenerated using string template disenumpart2.txt
-
     HAS_SLEPT_AN_AVERAGE_OF_4_HOURS_PER_DAY_IN_THE_LAST_THREE_DAYS (4, "Has slept an average of 4 hours per day in the last three days."),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Has slept an average of 5 hours per day in the last three days. */
-// autogenerated using string template disenumpart2.txt
-
     HAS_SLEPT_AN_AVERAGE_OF_5_HOURS_PER_DAY_IN_THE_LAST_THREE_DAYS (5, "Has slept an average of 5 hours per day in the last three days."),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Has slept an average of 6 hours per day in the last three days. */
-// autogenerated using string template disenumpart2.txt
-
     HAS_SLEPT_AN_AVERAGE_OF_6_HOURS_PER_DAY_IN_THE_LAST_THREE_DAYS (6, "Has slept an average of 6 hours per day in the last three days."),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Has slept an average of 7 hours per day in the last three days. */
-// autogenerated using string template disenumpart2.txt
-
     HAS_SLEPT_AN_AVERAGE_OF_7_HOURS_PER_DAY_IN_THE_LAST_THREE_DAYS (7, "Has slept an average of 7 hours per day in the last three days."),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fully rested (Has slept an average of 8 hours per day in the last three days) */
-// autogenerated using string template disenumpart2.txt
-
-    FULLY_RESTED_HAS_SLEPT_AN_AVERAGE_OF_8_HOURS_PER_DAY_IN_THE_LAST_THREE_DAYS (8, "Fully rested (Has slept an average of 8 hours per day in the last three days)"),;
-
-// autogenerated using string template disenumpart25.txt
+    FULLY_RESTED_HAS_SLEPT_AN_AVERAGE_OF_8_HOURS_PER_DAY_IN_THE_LAST_THREE_DAYS (8, "Fully rested (Has slept an average of 8 hours per day in the last three days)");
 
     private int value;
     private final String description;
@@ -122,8 +81,6 @@ public enum IsGroupOfRestStatus
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java
index 27aad5595f00f8f1fe4b0e6a739ed39e45170491..945a818fdc5fafd5ae58739cb441e6491bbdd0c6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 175,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 175 marshal size 8<br>
  * JTIDSMIDSModulationParametersSynchronizationState
  */
 public enum JTIDSMIDSModulationParametersSynchronizationState 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Initial Net Entry */
-// autogenerated using string template disenumpart2.txt
-
     INITIAL_NET_ENTRY (1, "Initial Net Entry"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Coarse Synchronization */
-// autogenerated using string template disenumpart2.txt
-
     COARSE_SYNCHRONIZATION (2, "Coarse Synchronization"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fine Synchronization */
-// autogenerated using string template disenumpart2.txt
-
     FINE_SYNCHRONIZATION (3, "Fine Synchronization"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Synchronization Maintenance */
-// autogenerated using string template disenumpart2.txt
-
-    SYNCHRONIZATION_MAINTENANCE (4, "Synchronization Maintenance"),;
-
-// autogenerated using string template disenumpart25.txt
+    SYNCHRONIZATION_MAINTENANCE (4, "Synchronization Maintenance");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum JTIDSMIDSModulationParametersSynchronizationState
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java
index 2418090f59856a7cb77c6b8a68e3b2ec09ee71c8..d699a804b3bb9c95d7d183045351f08558d65f66 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 173,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 173 marshal size 8<br>
  * JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode
  */
 public enum JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** NTR */
-// autogenerated using string template disenumpart2.txt
-
     NTR (1, "NTR"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** JTIDS Unit Participant */
-// autogenerated using string template disenumpart2.txt
-
-    JTIDS_UNIT_PARTICIPANT (2, "JTIDS Unit Participant"),;
-
-// autogenerated using string template disenumpart25.txt
+    JTIDS_UNIT_PARTICIPANT (2, "JTIDS Unit Participant");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java
index f30b06bd56e133142bff808447a72980b9f0bbe6..629f2f988375a23888d601f1d9a5b3f7109508c3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 174,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 174 marshal size 8<br>
  * JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode
  */
 public enum JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** None */
-// autogenerated using string template disenumpart2.txt
-
     NONE (0, "None"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Net Position Reference */
-// autogenerated using string template disenumpart2.txt
-
     NET_POSITION_REFERENCE (1, "Net Position Reference"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Primary Navigation Controller */
-// autogenerated using string template disenumpart2.txt
-
     PRIMARY_NAVIGATION_CONTROLLER (2, "Primary Navigation Controller"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Secondary Navigation Controller */
-// autogenerated using string template disenumpart2.txt
-
-    SECONDARY_NAVIGATION_CONTROLLER (3, "Secondary Navigation Controller"),;
-
-// autogenerated using string template disenumpart25.txt
+    SECONDARY_NAVIGATION_CONTROLLER (3, "Secondary Navigation Controller");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LeafCoverage.java b/src-generated/edu/nps/moves/dis7/enumerations/LeafCoverage.java
index 27e85c4b95977c59ccbc4e2a894e72a1315c2aa9..524d6adbfb0c9e84e3d80977cd4d43af7e780921 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LeafCoverage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LeafCoverage.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 509,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 509 marshal size 2<br>
  * LeafCoverage
  */
 public enum LeafCoverage 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Normal */
-// autogenerated using string template disenumpart2.txt
-
     NORMAL (0, "Normal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bare */
-// autogenerated using string template disenumpart2.txt
-
-    BARE (1, "Bare"),;
-
-// autogenerated using string template disenumpart25.txt
+    BARE (1, "Bare");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum LeafCoverage
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Level2SquitterStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/Level2SquitterStatus.java
index ec9f7d00242ef2b0e156418b3b7a9565d6e048aa..9d4bd56bafc31086ae1e6b6fe59f59a3badd5387 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Level2SquitterStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Level2SquitterStatus.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 353,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 353 marshal size 1<br>
  * Level2SquitterStatus
  */
 public enum Level2SquitterStatus 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Disabled */
-// autogenerated using string template disenumpart2.txt
-
     DISABLED (0, "Disabled"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Enabled */
-// autogenerated using string template disenumpart2.txt
-
-    ENABLED (1, "Enabled"),;
-
-// autogenerated using string template disenumpart25.txt
+    ENABLED (1, "Enabled");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum Level2SquitterStatus
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormAirCategories.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormAirCategories.java
index 912bcec4f8baa4029f68e39b727a39d6420d0cdc..bb38e0f6a71f5e884eea5de69a90fd90be545a88 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormAirCategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormAirCategories.java
@@ -7,33 +7,16 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 478,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 478 marshal size 8<br>
  * LifeFormAirCategories
  */
 public enum LifeFormAirCategories 
 {
-// autogenerated using string template disdictenumcomment.txt
-
-    /** SubcategoriesforAirCategory200Bird */// autogenerated using string template disenumpart21.txt
-
-    BIRD_2 (200, "Bird"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** SubcategoriesforAirCategory201Insect */// autogenerated using string template disenumpart21.txt
-
-    INSECT_2 (201, "Insect"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** SubcategoriesforAirCategory202Mammal */// autogenerated using string template disenumpart21.txt
-
-    MAMMAL_2 (202, "Mammal"),;
-
-// autogenerated using string template disenumpart25.txt
+    /** SubcategoriesforAirCategory200Bird */    BIRD_2 (200, "Bird"),
+    /** SubcategoriesforAirCategory201Insect */    INSECT_2 (201, "Insect"),
+    /** SubcategoriesforAirCategory202Mammal */    MAMMAL_2 (202, "Mammal");
 
     private int value;
     private final String description;
@@ -83,8 +66,6 @@ public enum LifeFormAirCategories
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesAfghanistan.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesAfghanistan.java
index 74b0a1a503a08dd40142bb77bc9f9c5ff055b443..39a5813bda193901ce41de386241ffd5a7083fcc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesAfghanistan.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesAfghanistan.java
@@ -7,96 +7,39 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 501,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 501 marshal size 8<br>
  * LifeFormCategoriesAfghanistan
  */
 public enum LifeFormCategoriesAfghanistan 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Afghan National Army (ANA) */
-// autogenerated using string template disenumpart2.txt
-
     AFGHAN_NATIONAL_ARMY_ANA (11, "Afghan National Army (ANA)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Afghan Air Force (AAF) */
-// autogenerated using string template disenumpart2.txt
-
     AFGHAN_AIR_FORCE_AAF (13, "Afghan Air Force (AAF)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** National Directorate of Security (NDS) */
-// autogenerated using string template disenumpart2.txt
-
     CREATE_ENTITY_RELIABLE (51, "National Directorate of Security (NDS)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Afghan National Police (ANP) */
-// autogenerated using string template disenumpart2.txt
-
     REMOVE_ENTITY_RELIABLE (52, "Afghan National Police (ANP)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Afghan Border Police (ABP) */
-// autogenerated using string template disenumpart2.txt
-
     START_RESUME_RELIABLE (53, "Afghan Border Police (ABP)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Afghan National Civil Order Police (ANCOP) */
-// autogenerated using string template disenumpart2.txt
-
     STOP_FREEZE_RELIABLE (54, "Afghan National Civil Order Police (ANCOP)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Afghan Public Protection Force (APPF) */
-// autogenerated using string template disenumpart2.txt
-
     ACKNOWLEDGE_RELIABLE (55, "Afghan Public Protection Force (APPF)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Non-Military National Government Agencies */
-// autogenerated using string template disenumpart2.txt
-
     NON_MILITARY_NATIONAL_GOVERNMENT_AGENCIES (70, "Non-Military National Government Agencies"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Terrorist Combatant */
-// autogenerated using string template disenumpart2.txt
-
     TERRORIST_COMBATANT (101, "Terrorist Combatant"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Humanitarian Organizations */
-// autogenerated using string template disenumpart2.txt
-
     HUMANITARIAN_ORGANIZATIONS (120, "Humanitarian Organizations"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Red Crescent */
-// autogenerated using string template disenumpart2.txt
-
     RED_CRESCENT (121, "Red Crescent"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Civilian */
-// autogenerated using string template disenumpart2.txt
-
     CIVILIAN (130, "Civilian"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Press */
-// autogenerated using string template disenumpart2.txt
-
-    PRESS (133, "Press"),;
-
-// autogenerated using string template disenumpart25.txt
+    PRESS (133, "Press");
 
     private int value;
     private final String description;
@@ -146,8 +89,6 @@ public enum LifeFormCategoriesAfghanistan
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesUS.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesUS.java
index 1e2de25b79df02eee99548aaaf7d0626bb03afed..d0d7aff859731a379db9eb176bfdfd0781a68651 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesUS.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesUS.java
@@ -7,144 +7,55 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 476,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 476 marshal size 8<br>
  * LifeFormCategoriesUS
  */
 public enum LifeFormCategoriesUS 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** U.S. Army (USA) */
-// autogenerated using string template disenumpart2.txt
-
     US_ARMY_USA (11, "U.S. Army (USA)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** U.S. Marine Corps (USMC) */
-// autogenerated using string template disenumpart2.txt
-
     US_MARINE_CORPS_USMC (12, "U.S. Marine Corps (USMC)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** U.S. Air Force (USAF) */
-// autogenerated using string template disenumpart2.txt
-
     US_AIR_FORCE_USAF (13, "U.S. Air Force (USAF)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** U.S. Navy (USN) */
-// autogenerated using string template disenumpart2.txt
-
     US_NAVY_USN (14, "U.S. Navy (USN)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** U.S. Coast Guard (USCG) */
-// autogenerated using string template disenumpart2.txt
-
     US_COAST_GUARD_USCG (15, "U.S. Coast Guard (USCG)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Rangers */
-// autogenerated using string template disenumpart2.txt
-
     RANGERS (31, "Rangers"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** ARSOF */
-// autogenerated using string template disenumpart2.txt
-
     ARSOF (32, "ARSOF"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Force Reconnaissance */
-// autogenerated using string template disenumpart2.txt
-
     FORCE_RECONNAISSANCE (33, "Force Reconnaissance"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Navy SEAL */
-// autogenerated using string template disenumpart2.txt
-
     NAVY_SEAL (34, "Navy SEAL"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** AFSOF */
-// autogenerated using string template disenumpart2.txt
-
     AFSOF (35, "AFSOF"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Delta Force */
-// autogenerated using string template disenumpart2.txt
-
     DELTA_FORCE (36, "Delta Force"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Federal Bureau of Investigation (FBI) */
-// autogenerated using string template disenumpart2.txt
-
     CREATE_ENTITY_RELIABLE (51, "Federal Bureau of Investigation (FBI)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Central Intelligence Agency (CIA) */
-// autogenerated using string template disenumpart2.txt
-
     REMOVE_ENTITY_RELIABLE (52, "Central Intelligence Agency (CIA)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Department of Homeland Security (DHS) */
-// autogenerated using string template disenumpart2.txt
-
     START_RESUME_RELIABLE (53, "Department of Homeland Security (DHS)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bureau of Alcohol, Tobacco, Firearms and Explosives (ATF) */
-// autogenerated using string template disenumpart2.txt
-
     STOP_FREEZE_RELIABLE (54, "Bureau of Alcohol, Tobacco, Firearms and Explosives (ATF)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** U.S. Secret Service (USSS) */
-// autogenerated using string template disenumpart2.txt
-
     ACKNOWLEDGE_RELIABLE (55, "U.S. Secret Service (USSS)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** U.S. Marshal */
-// autogenerated using string template disenumpart2.txt
-
     ACTION_REQUEST_RELIABLE (56, "U.S. Marshal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** State Police (Highway Patrol) */
-// autogenerated using string template disenumpart2.txt
-
     STATE_POLICE_HIGHWAY_PATROL (71, "State Police (Highway Patrol)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** County Sheriff/Police */
-// autogenerated using string template disenumpart2.txt
-
     COUNTY_SHERIFF_POLICE (72, "County Sheriff/Police"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Municipal Police */
-// autogenerated using string template disenumpart2.txt
-
     MUNICIPAL_POLICE (73, "Municipal Police"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Red Cross */
-// autogenerated using string template disenumpart2.txt
-
-    RED_CROSS (124, "Red Cross"),;
-
-// autogenerated using string template disenumpart25.txt
+    RED_CROSS (124, "Red Cross");
 
     private int value;
     private final String description;
@@ -194,8 +105,6 @@ public enum LifeFormCategoriesUS
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormExtraPersonalData.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormExtraPersonalData.java
index dff8eb36dd69f01e372258e5e06c729fc3de7f73..7b4f125a7c5d481dee3c7875f78887cda43ef433 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormExtraPersonalData.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormExtraPersonalData.java
@@ -7,247 +7,91 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 477, marshal size 8,
- * LifeFormExtraPersonalData
+ * Generated from XML, <br>
+ * UID 477 marshal size 8<br>
+ * LifeFormExtraPersonalData<br>
  * The 1s digit is reserved for Race/Ethnicity and the enumerations are taken from the U.S. OMB. The 10s digit is reserved for general age group. The 100s digit is reserved for gender, where 0 is Male and 1 is Female.
  */
 public enum LifeFormExtraPersonalData 
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Specified (Male) */
-// autogenerated using string template disenumpart2.txt
-
     NOT_SPECIFIED_MALE (0, "Not Specified (Male)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Asian (Male) */
-// autogenerated using string template disenumpart2.txt
-
     ASIAN_MALE (1, "Asian (Male)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pacific Islander (Male) */
-// autogenerated using string template disenumpart2.txt
-
     PACIFIC_ISLANDER_MALE (2, "Pacific Islander (Male)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Black (Male) */
-// autogenerated using string template disenumpart2.txt
-
     BLACK_MALE (3, "Black (Male)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** East Asian (Male) */
-// autogenerated using string template disenumpart2.txt
-
     EAST_ASIAN_MALE (4, "East Asian (Male)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hispanic (Male) */
-// autogenerated using string template disenumpart2.txt
-
     HISPANIC_MALE (5, "Hispanic (Male)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** White (Male) */
-// autogenerated using string template disenumpart2.txt
-
     WHITE_MALE (6, "White (Male)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Arab (Male) */
-// autogenerated using string template disenumpart2.txt
-
     ARAB_MALE (7, "Arab (Male)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Homogenous Country Code (Male) */
-// autogenerated using string template disenumpart2.txt
-
     HOMOGENOUS_COUNTRY_CODE_MALE (8, "Homogenous Country Code (Male)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Indigenous Country Code (Male) */
-// autogenerated using string template disenumpart2.txt
-
     INDIGENOUS_COUNTRY_CODE_MALE (9, "Indigenous Country Code (Male)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Infant (0 months-1 year) (Male) */
-// autogenerated using string template disenumpart2.txt
-
     INFANT_0_MONTHS_1_YEAR_MALE (10, "Infant (0 months-1 year) (Male)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Toddler (1-3 years) (Male) */
-// autogenerated using string template disenumpart2.txt
-
     TODDLER_1_3_YEARS_MALE (20, "Toddler (1-3 years) (Male)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Child (3-10 years) (Male) */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Child (3-10 years) (Male)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Adolescent (10-12 years) (Male) */
-// autogenerated using string template disenumpart2.txt
-
     ADOLESCENT_10_12_YEARS_MALE (40, "Adolescent (10-12 years) (Male)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Teenager (13-16 years) (Male) */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "Teenager (13-16 years) (Male)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Young Adult (17-25 years) (Male) */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "Young Adult (17-25 years) (Male)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Adult (25-55 years) (Male) */
-// autogenerated using string template disenumpart2.txt
-
     ADULT_25_55_YEARS_MALE (70, "Adult (25-55 years) (Male)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Senior Adult (55-70 years) (Male) */
-// autogenerated using string template disenumpart2.txt
-
     SENIOR_ADULT_55_70_YEARS_MALE (80, "Senior Adult (55-70 years) (Male)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Elderly (71+ years) (Male) */
-// autogenerated using string template disenumpart2.txt
-
     ELDERLY_71PLUS_YEARS_MALE (90, "Elderly (71+ years) (Male)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Female */
-// autogenerated using string template disenumpart2.txt
-
     FEMALE (100, "Female"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Asian (Female) */
-// autogenerated using string template disenumpart2.txt
-
     ASIAN_FEMALE (101, "Asian (Female)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pacific Islander (Female) */
-// autogenerated using string template disenumpart2.txt
-
     PACIFIC_ISLANDER_FEMALE (102, "Pacific Islander (Female)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Black (Female) */
-// autogenerated using string template disenumpart2.txt
-
     BLACK_FEMALE (103, "Black (Female)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** East Asian (Female) */
-// autogenerated using string template disenumpart2.txt
-
     EAST_ASIAN_FEMALE (104, "East Asian (Female)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hispanic (Female) */
-// autogenerated using string template disenumpart2.txt
-
     HISPANIC_FEMALE (105, "Hispanic (Female)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** White (Female) */
-// autogenerated using string template disenumpart2.txt
-
     WHITE_FEMALE (106, "White (Female)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Arab (Female) */
-// autogenerated using string template disenumpart2.txt
-
     ARAB_FEMALE (107, "Arab (Female)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Homogenous Country Code (Female) */
-// autogenerated using string template disenumpart2.txt
-
     HOMOGENOUS_COUNTRY_CODE_FEMALE (108, "Homogenous Country Code (Female)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Indigenous Country Code (Female) */
-// autogenerated using string template disenumpart2.txt
-
     INDIGENOUS_COUNTRY_CODE_FEMALE (109, "Indigenous Country Code (Female)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Infant (0 months-1 year) (Female) */
-// autogenerated using string template disenumpart2.txt
-
     INFANT_0_MONTHS_1_YEAR_FEMALE (110, "Infant (0 months-1 year) (Female)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Toddler (1-3 years) (Female) */
-// autogenerated using string template disenumpart2.txt
-
     TODDLER_1_3_YEARS_FEMALE (120, "Toddler (1-3 years) (Female)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Child (3-10 years) (Female) */
-// autogenerated using string template disenumpart2.txt
-
     CHILD_3_10_YEARS_FEMALE (130, "Child (3-10 years) (Female)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Adolescent (10-12 years) (Female) */
-// autogenerated using string template disenumpart2.txt
-
     ADOLESCENT_10_12_YEARS_FEMALE (140, "Adolescent (10-12 years) (Female)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Teenager (13-16 years) (Female) */
-// autogenerated using string template disenumpart2.txt
-
     TEENAGER_13_16_YEARS_FEMALE (150, "Teenager (13-16 years) (Female)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Young Adult (17-25 years) (Female) */
-// autogenerated using string template disenumpart2.txt
-
     YOUNG_ADULT_17_25_YEARS_FEMALE (160, "Young Adult (17-25 years) (Female)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Adult (25-55 years) (Female) */
-// autogenerated using string template disenumpart2.txt
-
     ADULT_25_55_YEARS_FEMALE (170, "Adult (25-55 years) (Female)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Senior Adult (55-70 years) (Female) */
-// autogenerated using string template disenumpart2.txt
-
     SENIOR_ADULT_55_70_YEARS_FEMALE (180, "Senior Adult (55-70 years) (Female)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Elderly (71+ years) (Female) */
-// autogenerated using string template disenumpart2.txt
-
-    ELDERLY_71PLUS_YEARS_FEMALE (190, "Elderly (71+ years) (Female)"),;
-
-// autogenerated using string template disenumpart25.txt
+    ELDERLY_71PLUS_YEARS_FEMALE (190, "Elderly (71+ years) (Female)");
 
     private int value;
     private final String description;
@@ -297,8 +141,6 @@ public enum LifeFormExtraPersonalData
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java
index c4fad3b4ef63627330b3aaab0a68ac0810dc516a..566accae714d148ffb5e75aef7844a963eb62f4f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 510,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 510 marshal size 8<br>
  * LifeFormHumanSpecificAntiMaterielRifles
  */
 public enum LifeFormHumanSpecificAntiMaterielRifles 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 12.7mm AW50 */
-// autogenerated using string template disenumpart2.txt
-
     _127MM_AW50 (10, "12.7mm AW50"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 12.7mm AW50F */
-// autogenerated using string template disenumpart2.txt
-
-    _127MM_AW50F (11, "12.7mm AW50F"),;
-
-// autogenerated using string template disenumpart25.txt
+    _127MM_AW50F (11, "12.7mm AW50F");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum LifeFormHumanSpecificAntiMaterielRifles
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankMissiles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankMissiles.java
index 836239ac130bfcb8f718af989eb57815600cb78d..601e91f32dd061983b2342a27652956ed0424e8e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankMissiles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankMissiles.java
@@ -7,462 +7,161 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 519,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 519 marshal size 8<br>
  * LifeFormHumanSpecificAntiTankMissiles
  */
 public enum LifeFormHumanSpecificAntiTankMissiles 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 120mm Type 64 MAT KAM-3 */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "120mm Type 64 MAT KAM-3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 153mm Type 79 Jyu-MAT KAM-9 */
-// autogenerated using string template disenumpart2.txt
-
     _153MM_TYPE_79_JYU_MAT_KAM_9 (31, "153mm Type 79 Jyu-MAT KAM-9"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 120mm Type 87 Chu-MAT */
-// autogenerated using string template disenumpart2.txt
-
     _120MM_TYPE_87_CHU_MAT (32, "120mm Type 87 Chu-MAT"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 140mm Type 01 LMAT */
-// autogenerated using string template disenumpart2.txt
-
     _140MM_TYPE_01_LMAT (33, "140mm Type 01 LMAT"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 140mm M47 Dragon */
-// autogenerated using string template disenumpart2.txt
-
     DATA_QUERY_RELIABLE (58, "140mm M47 Dragon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 140mm Saeghe 1-2 */
-// autogenerated using string template disenumpart2.txt
-
     SET_DATA_RELIABLE (59, "140mm Saeghe 1-2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 127mm FGM-148 Javelin */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "127mm FGM-148 Javelin"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 139mm FGM-172 SRAW */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_RELIABLE (63, "139mm FGM-172 SRAW"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 139mm FGM-172B SRAW-MPV */
-// autogenerated using string template disenumpart2.txt
-
     SET_RECORD_RELIABLE	 (64, "139mm FGM-172B SRAW-MPV"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 152mm BGM-71 TOW */
-// autogenerated using string template disenumpart2.txt
-
     _152MM_BGM_71_TOW (68, "152mm BGM-71 TOW"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 152mm Orev TOW II */
-// autogenerated using string template disenumpart2.txt
-
     _152MM_OREV_TOW_II (69, "152mm Orev TOW II"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 120mm Vickers Vigilant / Clevite */
-// autogenerated using string template disenumpart2.txt
-
     _120MM_VICKERS_VIGILANT_CLEVITE (75, "120mm Vickers Vigilant / Clevite"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 110mm Bantam (Rb 53) */
-// autogenerated using string template disenumpart2.txt
-
     _110MM_BANTAM_RB_53 (80, "110mm Bantam (Rb 53)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 150mm RBS-56 BILL 1 */
-// autogenerated using string template disenumpart2.txt
-
     _150MM_RBS_56_BILL_1 (81, "150mm RBS-56 BILL 1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 150mm RBS-56-2 BILL 2 */
-// autogenerated using string template disenumpart2.txt
-
     _150MM_RBS_56_2_BILL_2 (82, "150mm RBS-56-2 BILL 2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 130mm Spike SR */
-// autogenerated using string template disenumpart2.txt
-
     _130MM_SPIKE_SR (85, "130mm Spike SR"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 130mm Spike MR (CLU) */
-// autogenerated using string template disenumpart2.txt
-
     _130MM_SPIKE_MR_CLU (86, "130mm Spike MR (CLU)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 130mm Spike LR (CLU) */
-// autogenerated using string template disenumpart2.txt
-
     _130MM_SPIKE_LR_CLU (87, "130mm Spike LR (CLU)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 60mm Mosquito */
-// autogenerated using string template disenumpart2.txt
-
     _60MM_MOSQUITO (95, "60mm Mosquito"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 160mm SS.10 */
-// autogenerated using string template disenumpart2.txt
-
     _160MM_SS10 (98, "160mm SS.10"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 103mm MILAN */
-// autogenerated using string template disenumpart2.txt
-
     _103MM_MILAN (100, "103mm MILAN"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 115mm MILAN 2 */
-// autogenerated using string template disenumpart2.txt
-
     _115MM_MILAN_2 (101, "115mm MILAN 2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 115mm MILAN 2T */
-// autogenerated using string template disenumpart2.txt
-
     _115MM_MILAN_2T (102, "115mm MILAN 2T"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 115mm MILAN 3 */
-// autogenerated using string template disenumpart2.txt
-
     _115MM_MILAN_3 (103, "115mm MILAN 3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 115mm MILAN ER */
-// autogenerated using string template disenumpart2.txt
-
     _115MM_MILAN_ER (104, "115mm MILAN ER"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 136mm ERYX */
-// autogenerated using string template disenumpart2.txt
-
     _136MM_ERYX (105, "136mm ERYX"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 152mm Entac */
-// autogenerated using string template disenumpart2.txt
-
     _152MM_ENTAC (107, "152mm Entac"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 125mm RAAD */
-// autogenerated using string template disenumpart2.txt
-
     _125MM_RAAD (110, "125mm RAAD"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 125mm I-RAAD-T */
-// autogenerated using string template disenumpart2.txt
-
     _125MM_I_RAAD_T (111, "125mm I-RAAD-T"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 152mm Toophan */
-// autogenerated using string template disenumpart2.txt
-
     _152MM_TOOPHAN (112, "152mm Toophan"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 152mm Toophan 2 */
-// autogenerated using string template disenumpart2.txt
-
     _152MM_TOOPHAN_2 (113, "152mm Toophan 2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 152mm Toophan 5 */
-// autogenerated using string template disenumpart2.txt
-
     _152MM_TOOPHAN_5 (114, "152mm Toophan 5"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 136mm Bumbar */
-// autogenerated using string template disenumpart2.txt
-
     _136MM_BUMBAR (120, "136mm Bumbar"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 130mm Shershen PK-2 */
-// autogenerated using string template disenumpart2.txt
-
     _130MM_SHERSHEN_PK_2 (125, "130mm Shershen PK-2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 152mm Shershen-Q P-2B */
-// autogenerated using string template disenumpart2.txt
-
     _152MM_SHERSHEN_Q_P_2B (126, "152mm Shershen-Q P-2B"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 130mm Mectron MSS-1.2 */
-// autogenerated using string template disenumpart2.txt
-
     _130MM_MECTRON_MSS_12 (130, "130mm Mectron MSS-1.2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 120mm HJ-8 */
-// autogenerated using string template disenumpart2.txt
-
     _120MM_HJ_8 (140, "120mm HJ-8"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 120mm HJ-8A */
-// autogenerated using string template disenumpart2.txt
-
     _120MM_HJ_8A (141, "120mm HJ-8A"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 120mm HJ-8B */
-// autogenerated using string template disenumpart2.txt
-
     _120MM_HJ_8B (142, "120mm HJ-8B"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 120mm HJ-8C */
-// autogenerated using string template disenumpart2.txt
-
     _120MM_HJ_8C (143, "120mm HJ-8C"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 120mm HJ-8D */
-// autogenerated using string template disenumpart2.txt
-
     _120MM_HJ_8D (144, "120mm HJ-8D"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 120mm HJ-8E */
-// autogenerated using string template disenumpart2.txt
-
     _120MM_HJ_8E (145, "120mm HJ-8E"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 120mm HJ-8F */
-// autogenerated using string template disenumpart2.txt
-
     _120MM_HJ_8F (146, "120mm HJ-8F"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 120mm HJ-8FAE */
-// autogenerated using string template disenumpart2.txt
-
     _120MM_HJ_8FAE (147, "120mm HJ-8FAE"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 120mm HJ-8L */
-// autogenerated using string template disenumpart2.txt
-
     _120MM_HJ_8L (148, "120mm HJ-8L"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 120mm HJ-8H */
-// autogenerated using string template disenumpart2.txt
-
     _120MM_HJ_8H (149, "120mm HJ-8H"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 120mm HJ-8S */
-// autogenerated using string template disenumpart2.txt
-
     _120MM_HJ_8S (150, "120mm HJ-8S"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 120mm Baktar-Shikan */
-// autogenerated using string template disenumpart2.txt
-
     _120MM_BAKTAR_SHIKAN (151, "120mm Baktar-Shikan"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 120mm HJ-11 (AFT-11) */
-// autogenerated using string template disenumpart2.txt
-
     _120MM_HJ_11_AFT_11 (152, "120mm HJ-11 (AFT-11)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 152mm HJ-9A */
-// autogenerated using string template disenumpart2.txt
-
     _152MM_HJ_9A (153, "152mm HJ-9A"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 135mm HJ-12 Red Arrow */
-// autogenerated using string template disenumpart2.txt
-
     _135MM_HJ_12_RED_ARROW (154, "135mm HJ-12 Red Arrow"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 125mm HJ-73 MCLOS */
-// autogenerated using string template disenumpart2.txt
-
     _125MM_HJ_73_MCLOS (155, "125mm HJ-73 MCLOS"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 125mm HJ-73B SACLOS */
-// autogenerated using string template disenumpart2.txt
-
     _125MM_HJ_73B_SACLOS (156, "125mm HJ-73B SACLOS"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 125mm HJ-73C SACLOS ERA */
-// autogenerated using string template disenumpart2.txt
-
     _125MM_HJ_73C_SACLOS_ERA (157, "125mm HJ-73C SACLOS ERA"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 125mm AT-3 Sagger A/9M14 Malyutka */
-// autogenerated using string template disenumpart2.txt
-
     _125MM_AT_3_SAGGER_A_9M14_MALYUTKA (170, "125mm AT-3 Sagger A/9M14 Malyutka"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 125mm AT-3B Sagger B/9M14M Malyutka-M */
-// autogenerated using string template disenumpart2.txt
-
     _125MM_AT_3B_SAGGER_B_9M14M_MALYUTKA_M (171, "125mm AT-3B Sagger B/9M14M Malyutka-M"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 125mm AT-3C Sagger C/9M14P Malyutka-P */
-// autogenerated using string template disenumpart2.txt
-
     _125MM_AT_3C_SAGGER_C_9M14P_MALYUTKA_P (172, "125mm AT-3C Sagger C/9M14P Malyutka-P"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 125mm AT-3D Sagger D/9M14-2 Malyutka-2 */
-// autogenerated using string template disenumpart2.txt
-
     _125MM_AT_3D_SAGGER_D_9M14_2_MALYUTKA_2 (173, "125mm AT-3D Sagger D/9M14-2 Malyutka-2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 125mm Susong-Po */
-// autogenerated using string template disenumpart2.txt
-
     _125MM_SUSONG_PO (174, "125mm Susong-Po"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 125mm AT-3C POLK */
-// autogenerated using string template disenumpart2.txt
-
     _125MM_AT_3C_POLK (175, "125mm AT-3C POLK"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 125mm Kun Wu 1 */
-// autogenerated using string template disenumpart2.txt
-
     _125MM_KUN_WU_1 (176, "125mm Kun Wu 1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 125mm Maliutka M2T */
-// autogenerated using string template disenumpart2.txt
-
     _125MM_MALIUTKA_M2T (177, "125mm Maliutka M2T"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 120mm AT-4A Spigot A/9M111 Fagot */
-// autogenerated using string template disenumpart2.txt
-
     _120MM_AT_4A_SPIGOT_A_9M111_FAGOT (178, "120mm AT-4A Spigot A/9M111 Fagot"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 120mm AT-4B Spigot B/9M111-2 Fagot */
-// autogenerated using string template disenumpart2.txt
-
     _120MM_AT_4B_SPIGOT_B_9M111_2_FAGOT (179, "120mm AT-4B Spigot B/9M111-2 Fagot"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 120mm AT-4C Spigot C/9M111M Faktoriya */
-// autogenerated using string template disenumpart2.txt
-
     _120MM_AT_4C_SPIGOT_C_9M111M_FAKTORIYA (180, "120mm AT-4C Spigot C/9M111M Faktoriya"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 135mm AT-5A Spandrel/9M113 Kronkurs */
-// autogenerated using string template disenumpart2.txt
-
     _135MM_AT_5A_SPANDREL_9M113_KRONKURS (181, "135mm AT-5A Spandrel/9M113 Kronkurs"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 135mm AT-5B Spandrel/9M113M Kronkurs-M */
-// autogenerated using string template disenumpart2.txt
-
     _135MM_AT_5B_SPANDREL_9M113M_KRONKURS_M (182, "135mm AT-5B Spandrel/9M113M Kronkurs-M"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 135mm Tosan */
-// autogenerated using string template disenumpart2.txt
-
     _135MM_TOSAN (183, "135mm Tosan"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 94mm AT-7 Saxhorn/9K115 Metis */
-// autogenerated using string template disenumpart2.txt
-
     _94MM_AT_7_SAXHORN_9K115_METIS (184, "94mm AT-7 Saxhorn/9K115 Metis"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 130mm AT-13 Saxhorn-2/9K115-2 Metis-M */
-// autogenerated using string template disenumpart2.txt
-
     _130MM_AT_13_SAXHORN_2_9K115_2_METIS_M (185, "130mm AT-13 Saxhorn-2/9K115-2 Metis-M"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 152mm AT-14 Spriggan/9M133 Kornet */
-// autogenerated using string template disenumpart2.txt
-
     _152MM_AT_14_SPRIGGAN_9M133_KORNET (186, "152mm AT-14 Spriggan/9M133 Kornet"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 152mm Dehlavie */
-// autogenerated using string template disenumpart2.txt
-
     _152MM_DEHLAVIE (187, "152mm Dehlavie"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 102mm Mathogo */
-// autogenerated using string template disenumpart2.txt
-
-    _102MM_MATHOGO (200, "102mm Mathogo"),;
-
-// autogenerated using string template disenumpart25.txt
+    _102MM_MATHOGO (200, "102mm Mathogo");
 
     private int value;
     private final String description;
@@ -512,8 +211,6 @@ public enum LifeFormHumanSpecificAntiTankMissiles
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankRockets.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankRockets.java
index 9ad1d91ec44bd70a2fd86155245998961a206290..1eb16362432cfa73d9ce5425203cc1321c4d9a12 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankRockets.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankRockets.java
@@ -7,432 +7,151 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 518,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 518 marshal size 8<br>
  * LifeFormHumanSpecificAntiTankRockets
  */
 public enum LifeFormHumanSpecificAntiTankRockets 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 82mm B-300 */
-// autogenerated using string template disenumpart2.txt
-
     _82MM_B_300 (10, "82mm B-300"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 82mm Shipon */
-// autogenerated using string template disenumpart2.txt
-
     _82MM_SHIPON (11, "82mm Shipon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 83mm MK153 Mod 0 SMAW */
-// autogenerated using string template disenumpart2.txt
-
     _83MM_MK153_MOD_0_SMAW (12, "83mm MK153 Mod 0 SMAW"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 66mm M72 LAW */
-// autogenerated using string template disenumpart2.txt
-
     _66MM_M72_LAW (20, "66mm M72 LAW"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 66mm M72A1 LAW */
-// autogenerated using string template disenumpart2.txt
-
     _66MM_M72A1_LAW (21, "66mm M72A1 LAW"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 66mm M72A2 LAW */
-// autogenerated using string template disenumpart2.txt
-
     _66MM_M72A2_LAW (22, "66mm M72A2 LAW"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 66mm M72A3 LAW */
-// autogenerated using string template disenumpart2.txt
-
     _66MM_M72A3_LAW (23, "66mm M72A3 LAW"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 66mm M72A4 LAW */
-// autogenerated using string template disenumpart2.txt
-
     _66MM_M72A4_LAW (24, "66mm M72A4 LAW"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 66mm M72A5 LAW */
-// autogenerated using string template disenumpart2.txt
-
     _66MM_M72A5_LAW (25, "66mm M72A5 LAW"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 66mm M72A6 LAW */
-// autogenerated using string template disenumpart2.txt
-
     _66MM_M72A6_LAW (26, "66mm M72A6 LAW"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 66mm M72A7 LAW */
-// autogenerated using string template disenumpart2.txt
-
     _66MM_M72A7_LAW (27, "66mm M72A7 LAW"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 66mm M72E8 LAW */
-// autogenerated using string template disenumpart2.txt
-
     IDENTIFICATION_FRIEND_OR_FOE (28, "66mm M72E8 LAW"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 66mm M72E9 LAW */
-// autogenerated using string template disenumpart2.txt
-
     _66MM_M72E9_LAW (29, "66mm M72E9 LAW"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 66mm M72E10 LAW */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "66mm M72E10 LAW"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 66mm M72AS LAW */
-// autogenerated using string template disenumpart2.txt
-
     _66MM_M72AS_LAW (31, "66mm M72AS LAW"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 94mm LAW 80 */
-// autogenerated using string template disenumpart2.txt
-
     _94MM_LAW_80 (35, "94mm LAW 80"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 60mm M1 Bazooka */
-// autogenerated using string template disenumpart2.txt
-
     _60MM_M1_BAZOOKA (40, "60mm M1 Bazooka"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 60mm M1A1 Bazooka */
-// autogenerated using string template disenumpart2.txt
-
     _60MM_M1A1_BAZOOKA (41, "60mm M1A1 Bazooka"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 60mm M9 Bazooka */
-// autogenerated using string template disenumpart2.txt
-
     _60MM_M9_BAZOOKA (42, "60mm M9 Bazooka"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 60mm M9A1 Bazooka */
-// autogenerated using string template disenumpart2.txt
-
     _60MM_M9A1_BAZOOKA (43, "60mm M9A1 Bazooka"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 89mm M20 Super Bazooka */
-// autogenerated using string template disenumpart2.txt
-
     _89MM_M20_SUPER_BAZOOKA (44, "89mm M20 Super Bazooka"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 89mm M20A1 Super Bazooka */
-// autogenerated using string template disenumpart2.txt
-
     _89MM_M20A1_SUPER_BAZOOKA (45, "89mm M20A1 Super Bazooka"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 89mm M20B1 Super Bazooka */
-// autogenerated using string template disenumpart2.txt
-
     TIME_SPACE_POSITION_INFORMATION (46, "89mm M20B1 Super Bazooka"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 89mm M20A1B1 Super Bazooka */
-// autogenerated using string template disenumpart2.txt
-
     _89MM_M20A1B1_SUPER_BAZOOKA (47, "89mm M20A1B1 Super Bazooka"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 89mm M25 Three Shot Bazooka */
-// autogenerated using string template disenumpart2.txt
-
     _89MM_M25_THREE_SHOT_BAZOOKA (48, "89mm M25 Three Shot Bazooka"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 89mm Instalaza M65 */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_FIRE (49, "89mm Instalaza M65"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 90mm Instalaza C90 */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "90mm Instalaza C90"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 90mm C90-CR (M3) */
-// autogenerated using string template disenumpart2.txt
-
     CREATE_ENTITY_RELIABLE (51, "90mm C90-CR (M3)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 90mm C90-CR-AM (M3) */
-// autogenerated using string template disenumpart2.txt
-
     REMOVE_ENTITY_RELIABLE (52, "90mm C90-CR-AM (M3)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 90mm C90-CR-BK (M3) */
-// autogenerated using string template disenumpart2.txt
-
     START_RESUME_RELIABLE (53, "90mm C90-CR-BK (M3)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 90mm C90-CR-IN (M3) */
-// autogenerated using string template disenumpart2.txt
-
     STOP_FREEZE_RELIABLE (54, "90mm C90-CR-IN (M3)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 60mm PzF 3 */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "60mm PzF 3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 60mm PzF 3-IT */
-// autogenerated using string template disenumpart2.txt
-
     EVENT_REPORT_RELIABLE (61, "60mm PzF 3-IT"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 60mm PzF 3 Bunkerfaust */
-// autogenerated using string template disenumpart2.txt
-
     COMMENT_RELIABLE (62, "60mm PzF 3 Bunkerfaust"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 44mm PzF 44 */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_QUERY_RELIABLE (65, "44mm PzF 44"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 30mm Panzerfaust 30 */
-// autogenerated using string template disenumpart2.txt
-
     _30MM_PANZERFAUST_30 (70, "30mm Panzerfaust 30"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 50mm Panzerfaust 60 */
-// autogenerated using string template disenumpart2.txt
-
     _50MM_PANZERFAUST_60 (71, "50mm Panzerfaust 60"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 60mm Panzerfaust 100 */
-// autogenerated using string template disenumpart2.txt
-
     _60MM_PANZERFAUST_100 (72, "60mm Panzerfaust 100"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 60mm Panzerfaust 150 */
-// autogenerated using string template disenumpart2.txt
-
     _60MM_PANZERFAUST_150 (73, "60mm Panzerfaust 150"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 88mm Panzerschreck RPzB */
-// autogenerated using string template disenumpart2.txt
-
     _88MM_PANZERSCHRECK_RPZB (75, "88mm Panzerschreck RPzB"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 83mm RL-83 Blindicide */
-// autogenerated using string template disenumpart2.txt
-
     _83MM_RL_83_BLINDICIDE (80, "83mm RL-83 Blindicide"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 100mm RL-100 Blindicide */
-// autogenerated using string template disenumpart2.txt
-
     _100MM_RL_100_BLINDICIDE (81, "100mm RL-100 Blindicide"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 90mm M79 Osa (Wasp) */
-// autogenerated using string template disenumpart2.txt
-
     _90MM_M79_OSA_WASP (85, "90mm M79 Osa (Wasp)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 64mm M80 Zolja (Wasp) */
-// autogenerated using string template disenumpart2.txt
-
     _64MM_M80_ZOLJA_WASP (86, "64mm M80 Zolja (Wasp)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 67mm Armburst Crossbow */
-// autogenerated using string template disenumpart2.txt
-
     _67MM_ARMBURST_CROSSBOW (90, "67mm Armburst Crossbow"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40mm Type-69 RPG */
-// autogenerated using string template disenumpart2.txt
-
     _40MM_TYPE_69_RPG (93, "40mm Type-69 RPG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 89mm PIAT */
-// autogenerated using string template disenumpart2.txt
-
     _89MM_PIAT (95, "89mm PIAT"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40mm RPG-2 */
-// autogenerated using string template disenumpart2.txt
-
     _40MM_RPG_2 (100, "40mm RPG-2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 64mm RPG-18 Mukha */
-// autogenerated using string template disenumpart2.txt
-
     _64MM_RPG_18_MUKHA (101, "64mm RPG-18 Mukha"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 72.5mm RPG-22 Netto */
-// autogenerated using string template disenumpart2.txt
-
     _725MM_RPG_22_NETTO (102, "72.5mm RPG-22 Netto"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 72.5mm RPG-26 Aglen */
-// autogenerated using string template disenumpart2.txt
-
     _725MM_RPG_26_AGLEN (103, "72.5mm RPG-26 Aglen"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 105mm RPG-29 Vampir */
-// autogenerated using string template disenumpart2.txt
-
     _105MM_RPG_29_VAMPIR (104, "105mm RPG-29 Vampir"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 105mm RPG-30 Kryuk */
-// autogenerated using string template disenumpart2.txt
-
     _105MM_RPG_30_KRYUK (105, "105mm RPG-30 Kryuk"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 105mm RPG-32 Nashshab */
-// autogenerated using string template disenumpart2.txt
-
     _105MM_RPG_32_NASHSHAB (106, "105mm RPG-32 Nashshab"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40mm RPG-7 */
-// autogenerated using string template disenumpart2.txt
-
     _40MM_RPG_7 (110, "40mm RPG-7"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40mm PSRL-1 (RPG-7USA) */
-// autogenerated using string template disenumpart2.txt
-
     _40MM_PSRL_1_RPG_7USA (111, "40mm PSRL-1 (RPG-7USA)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40mm GS-777/PSRL-2 */
-// autogenerated using string template disenumpart2.txt
-
     _40MM_GS_777_PSRL_2 (112, "40mm GS-777/PSRL-2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 68mm RPG-76 Komar (Mosquito) */
-// autogenerated using string template disenumpart2.txt
-
     _68MM_RPG_76_KOMAR_MOSQUITO (120, "68mm RPG-76 Komar (Mosquito)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 120mm SEP Dard 120 */
-// autogenerated using string template disenumpart2.txt
-
     _120MM_SEP_DARD_120 (125, "120mm SEP Dard 120"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 58mm WASP 58 */
-// autogenerated using string template disenumpart2.txt
-
     _58MM_WASP_58 (128, "58mm WASP 58"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 73mm LRAC 73-50 */
-// autogenerated using string template disenumpart2.txt
-
     _73MM_LRAC_73_50 (130, "73mm LRAC 73-50"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 89mm LRAC 89-F1 STRIM */
-// autogenerated using string template disenumpart2.txt
-
     _89MM_LRAC_89_F1_STRIM (131, "89mm LRAC 89-F1 STRIM"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 90mm MATADOR (Man-Portable Anti-Tank, Anti-DOoR) */
-// autogenerated using string template disenumpart2.txt
-
     _90MM_MATADOR_MAN_PORTABLE_ANTI_TANK_ANTI_DOOR (135, "90mm MATADOR (Man-Portable Anti-Tank, Anti-DOoR)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 90mm MATADOR-MP */
-// autogenerated using string template disenumpart2.txt
-
     _90MM_MATADOR_MP (136, "90mm MATADOR-MP"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 90mm MATADOR-WB */
-// autogenerated using string template disenumpart2.txt
-
     _90MM_MATADOR_WB (137, "90mm MATADOR-WB"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 90mm MATADOR-AS */
-// autogenerated using string template disenumpart2.txt
-
     _90MM_MATADOR_AS (138, "90mm MATADOR-AS"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 78mm MARA Anti-Tank Rocket Launcher */
-// autogenerated using string template disenumpart2.txt
-
     _78MM_MARA_ANTI_TANK_ROCKET_LAUNCHER (140, "78mm MARA Anti-Tank Rocket Launcher"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 120mm Type-98 PF98 */
-// autogenerated using string template disenumpart2.txt
-
-    _120MM_TYPE_98_PF98 (145, "120mm Type-98 PF98"),;
-
-// autogenerated using string template disenumpart25.txt
+    _120MM_TYPE_98_PF98 (145, "120mm Type-98 PF98");
 
     private int value;
     private final String description;
@@ -482,8 +201,6 @@ public enum LifeFormHumanSpecificAntiTankRockets
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAssaultRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAssaultRifles.java
index 0b15eba8e1b4da7a481233396cf45d9d90b53333..ed5fde87b73bf13ea800b97b938978db3973d46f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAssaultRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAssaultRifles.java
@@ -7,378 +7,133 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 474,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 474 marshal size 8<br>
  * LifeFormHumanSpecificAssaultRifles
  */
 public enum LifeFormHumanSpecificAssaultRifles 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 4.5mm Interdynamics MKR */
-// autogenerated using string template disenumpart2.txt
-
     _45MM_INTERDYNAMICS_MKR (1, "4.5mm Interdynamics MKR"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.45mm AK-74 */
-// autogenerated using string template disenumpart2.txt
-
     _545MM_AK_74 (10, "5.45mm AK-74"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.45mm AKS-74 */
-// autogenerated using string template disenumpart2.txt
-
     _545MM_AKS_74 (11, "5.45mm AKS-74"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.45mm AK-74M */
-// autogenerated using string template disenumpart2.txt
-
     _545MM_AK_74M (12, "5.45mm AK-74M"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.45mm Kbk wz. 1988 Tantal */
-// autogenerated using string template disenumpart2.txt
-
     _545MM_KBK_WZ_1988_TANTAL (13, "5.45mm Kbk wz. 1988 Tantal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm AK-101 */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "5.56mm AK-101"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Diemaco C7, Diemaco is now Colt Canada. */
-// autogenerated using string template disenumpart2.txt
-
     _556MM_DIEMACO_C7 (31, "5.56mm Diemaco C7"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Colt Canada C8 Carbine */
-// autogenerated using string template disenumpart2.txt
-
     _556MM_COLT_CANADA_C8_CARBINE (32, "5.56mm Colt Canada C8 Carbine"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm GIAT FAMAS G2 */
-// autogenerated using string template disenumpart2.txt
-
     _556MM_GIAT_FAMAS_G2 (33, "5.56mm GIAT FAMAS G2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm FN FNC */
-// autogenerated using string template disenumpart2.txt
-
     _556MM_FN_FNC (34, "5.56mm FN FNC"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm HK G36 */
-// autogenerated using string template disenumpart2.txt
-
     _556MM_HK_G36 (35, "5.56mm HK G36"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm IMI Galil */
-// autogenerated using string template disenumpart2.txt
-
     _556MM_IMI_GALIL (36, "5.56mm IMI Galil"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm INSAS */
-// autogenerated using string template disenumpart2.txt
-
     _556MM_INSAS (37, "5.56mm INSAS"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Daewoo K1 */
-// autogenerated using string template disenumpart2.txt
-
     _556MM_DAEWOO_K1 (38, "5.56mm Daewoo K1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Daewoo K2 */
-// autogenerated using string template disenumpart2.txt
-
     _556MM_DAEWOO_K2 (39, "5.56mm Daewoo K2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm M16A1 */
-// autogenerated using string template disenumpart2.txt
-
     _556MM_M16A1 (40, "5.56mm M16A1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm M16A2/A3/A4 */
-// autogenerated using string template disenumpart2.txt
-
     _556MM_M16A2_A3_A4 (41, "5.56mm M16A2/A3/A4"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Colt M4 */
-// autogenerated using string template disenumpart2.txt
-
     _556MM_COLT_M4 (42, "5.56mm Colt M4"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Colt M4 Special Operations Peculiar Modification (SOPMOD) */
-// autogenerated using string template disenumpart2.txt
-
     _556MM_COLT_M4_SPECIAL_OPERATIONS_PECULIAR_MODIFICATION_SOPMOD (43, "5.56mm Colt M4 Special Operations Peculiar Modification (SOPMOD)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Ruger Mini-14 */
-// autogenerated using string template disenumpart2.txt
-
     _556MM_RUGER_MINI_14 (44, "5.56mm Ruger Mini-14"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Enfield SA-80A2 */
-// autogenerated using string template disenumpart2.txt
-
     _556MM_ENFIELD_SA_80A2 (45, "5.56mm Enfield SA-80A2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Pindad SS1 V1 */
-// autogenerated using string template disenumpart2.txt
-
     TIME_SPACE_POSITION_INFORMATION (46, "5.56mm Pindad SS1 V1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Pindad SS1 V2 */
-// autogenerated using string template disenumpart2.txt
-
     _556MM_PINDAD_SS1_V2 (47, "5.56mm Pindad SS1 V2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Pindad SS1 V3 */
-// autogenerated using string template disenumpart2.txt
-
     _556MM_PINDAD_SS1_V3 (48, "5.56mm Pindad SS1 V3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Steyr AUG A1 */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_FIRE (49, "5.56mm Steyr AUG A1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm T65 */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "5.56mm T65"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm T91 */
-// autogenerated using string template disenumpart2.txt
-
     CREATE_ENTITY_RELIABLE (51, "5.56mm T91"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Tavor TAR-21 */
-// autogenerated using string template disenumpart2.txt
-
     REMOVE_ENTITY_RELIABLE (52, "5.56mm Tavor TAR-21"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Type CQ / M311 */
-// autogenerated using string template disenumpart2.txt
-
     START_RESUME_RELIABLE (53, "5.56mm Type CQ / M311"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Daewoo K11 */
-// autogenerated using string template disenumpart2.txt
-
     STOP_FREEZE_RELIABLE (54, "5.56mm Daewoo K11"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Austeyr F88 */
-// autogenerated using string template disenumpart2.txt
-
     ACKNOWLEDGE_RELIABLE (55, "5.56mm Austeyr F88"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Austeyr F88-GLA */
-// autogenerated using string template disenumpart2.txt
-
     ACTION_REQUEST_RELIABLE (56, "5.56mm Austeyr F88-GLA"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Austeyr F88-S-A1 */
-// autogenerated using string template disenumpart2.txt
-
     ACTION_RESPONSE_RELIABLE (57, "5.56mm Austeyr F88-S-A1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Austeyr F88-S-A2 */
-// autogenerated using string template disenumpart2.txt
-
     DATA_QUERY_RELIABLE (58, "5.56mm Austeyr F88-S-A2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Austeyr F88-C */
-// autogenerated using string template disenumpart2.txt
-
     SET_DATA_RELIABLE (59, "5.56mm Austeyr F88-C"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Austeyr F88-S-A1C */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "5.56mm Austeyr F88-S-A1C"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Austeyr F88-S-A1 LTR */
-// autogenerated using string template disenumpart2.txt
-
     EVENT_REPORT_RELIABLE (61, "5.56mm Austeyr F88-S-A1 LTR"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Austeyr EF88 */
-// autogenerated using string template disenumpart2.txt
-
     COMMENT_RELIABLE (62, "5.56mm Austeyr EF88"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Bushmaster XM15 */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_RELIABLE (63, "5.56mm Bushmaster XM15"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm HK416 */
-// autogenerated using string template disenumpart2.txt
-
     SET_RECORD_RELIABLE	 (64, "5.56mm HK416"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm F90 */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_QUERY_RELIABLE (65, "5.56mm F90"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm F90(G) */
-// autogenerated using string template disenumpart2.txt
-
     _556MM_F90G (66, "5.56mm F90(G)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm F90M */
-// autogenerated using string template disenumpart2.txt
-
     _556MM_F90M (67, "5.56mm F90M"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm F90M(G) */
-// autogenerated using string template disenumpart2.txt
-
     _556MM_F90MG (68, "5.56mm F90M(G)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm F90CQB */
-// autogenerated using string template disenumpart2.txt
-
     _556MM_F90CQB (69, "5.56mm F90CQB"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.8mm QBZ-95 (Type 95) */
-// autogenerated using string template disenumpart2.txt
-
     _58MM_QBZ_95_TYPE_95 (100, "5.8mm QBZ-95 (Type 95)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm AK-103 */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_AK_103 (110, "7.62mm AK-103"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm AK-104 */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_AK_104 (111, "7.62mm AK-104"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm AK-47 */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_AK_47 (112, "7.62mm AK-47"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm AKM */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_AKM (113, "7.62mm AKM"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm AKS-47 */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_AKS_47 (114, "7.62mm AKS-47"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm HK G3A3 */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_HK_G3A3 (115, "7.62mm HK G3A3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm IMI Galil */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_IMI_GALIL (116, "7.62mm IMI Galil"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm KLS */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_KLS (117, "7.62mm KLS"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm SKS */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_SKS (118, "7.62mm SKS"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm Type 56 */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_TYPE_56 (119, "7.62mm Type 56"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm Type 63/68 */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_TYPE_63_68 (120, "7.62mm Type 63/68"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm Type 81 */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_TYPE_81 (121, "7.62mm Type 81"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 8mm Lebel M16 */
-// autogenerated using string template disenumpart2.txt
-
-    _8MM_LEBEL_M16 (240, "8mm Lebel M16"),;
-
-// autogenerated using string template disenumpart25.txt
+    _8MM_LEBEL_M16 (240, "8mm Lebel M16");
 
     private int value;
     private final String description;
@@ -428,8 +183,6 @@ public enum LifeFormHumanSpecificAssaultRifles
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificDroneGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificDroneGuns.java
index d58aeaa122219d403c83031c1c92a939a5f50666..c7971829b6b98d5f06de16e05c1854befbd6f540 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificDroneGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificDroneGuns.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 524,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 524 marshal size 8<br>
  * LifeFormHumanSpecificDroneGuns
  */
 public enum LifeFormHumanSpecificDroneGuns 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** DroneGun Tactical */
-// autogenerated using string template disenumpart2.txt
-
     DRONEGUN_TACTICAL (15, "DroneGun Tactical"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** DroneGun MKII */
-// autogenerated using string template disenumpart2.txt
-
-    DRONEGUN_MKII (16, "DroneGun MKII"),;
-
-// autogenerated using string template disenumpart25.txt
+    DRONEGUN_MKII (16, "DroneGun MKII");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum LifeFormHumanSpecificDroneGuns
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificEquipmentClass.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificEquipmentClass.java
index 3d55c0181d7f8404296a58c0e8e0f98d5659597c..99411f440f5df5dc3b20db551dd227aacd35f774 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificEquipmentClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificEquipmentClass.java
@@ -7,48 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 505,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 505 marshal size 8<br>
  * LifeFormHumanSpecificEquipmentClass
  */
 public enum LifeFormHumanSpecificEquipmentClass 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Signal Smoke */
-// autogenerated using string template disenumpart2.txt
-
     SIGNAL_SMOKE (1, "Signal Smoke"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Flash Light */
-// autogenerated using string template disenumpart2.txt
-
     FLASH_LIGHT (2, "Flash Light"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Signal Mirror */
-// autogenerated using string template disenumpart2.txt
-
     SIGNAL_MIRROR (3, "Signal Mirror"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** IR Strobe */
-// autogenerated using string template disenumpart2.txt
-
     IR_STROBE (4, "IR Strobe"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** IR Illuminator */
-// autogenerated using string template disenumpart2.txt
-
-    IR_ILLUMINATOR (5, "IR Illuminator"),;
-
-// autogenerated using string template disenumpart25.txt
+    IR_ILLUMINATOR (5, "IR Illuminator");
 
     private int value;
     private final String description;
@@ -98,8 +73,6 @@ public enum LifeFormHumanSpecificEquipmentClass
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameRockets.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameRockets.java
index 275881dff157d291488e0e9801cc70a6aac23531..93422b46c7bfda834873f78c985c27be7fe1939f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameRockets.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameRockets.java
@@ -7,60 +7,27 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 522,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 522 marshal size 8<br>
  * LifeFormHumanSpecificFlameRockets
  */
 public enum LifeFormHumanSpecificFlameRockets 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 66mm M202 Flash */
-// autogenerated using string template disenumpart2.txt
-
     _66MM_M202_FLASH (20, "66mm M202 Flash"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 62mm FHJ-84 */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "62mm FHJ-84"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 90mm C90-CR-FIM (M3) */
-// autogenerated using string template disenumpart2.txt
-
     _90MM_C90_CR_FIM_M3 (40, "90mm C90-CR-FIM (M3)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 93mm RPO-A Shmel */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "93mm RPO-A Shmel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 93mm RPO-Z Shmel */
-// autogenerated using string template disenumpart2.txt
-
     CREATE_ENTITY_RELIABLE (51, "93mm RPO-Z Shmel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 93mm RPO-D Shmel */
-// autogenerated using string template disenumpart2.txt
-
-    REMOVE_ENTITY_RELIABLE (52, "93mm RPO-D Shmel"),;
-
-// autogenerated using string template disenumpart25.txt
+    REMOVE_ENTITY_RELIABLE (52, "93mm RPO-D Shmel");
 
     private int value;
     private final String description;
@@ -110,8 +77,6 @@ public enum LifeFormHumanSpecificFlameRockets
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameThrowers.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameThrowers.java
index df88fe24bf8260bfb5c1538050e1413769f7957f..267199de0a294d1b3ad94db0585e084c99e30e85 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameThrowers.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameThrowers.java
@@ -7,108 +7,43 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 523,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 523 marshal size 8<br>
  * LifeFormHumanSpecificFlameThrowers
  */
 public enum LifeFormHumanSpecificFlameThrowers 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Handflammpatrone */
-// autogenerated using string template disenumpart2.txt
-
     HANDFLAMMPATRONE (10, "Handflammpatrone"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** FmW 41 */
-// autogenerated using string template disenumpart2.txt
-
     FMW_41 (11, "FmW 41"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M1A1 */
-// autogenerated using string template disenumpart2.txt
-
     M1A1 (20, "M1A1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M2A1-7 */
-// autogenerated using string template disenumpart2.txt
-
     M2A1_7 (21, "M2A1-7"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M9A1-7 */
-// autogenerated using string template disenumpart2.txt
-
     M9A1_7 (22, "M9A1-7"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** LPO-50 */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "LPO-50"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** K Pattern */
-// autogenerated using string template disenumpart2.txt
-
     K_PATTERN (35, "K Pattern"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Portable, No 2 Ack Pack */
-// autogenerated using string template disenumpart2.txt
-
     PORTABLE_NO_2_ACK_PACK (36, "Portable, No 2 Ack Pack"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Marsden */
-// autogenerated using string template disenumpart2.txt
-
     MARSDEN (37, "Marsden"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Harvey */
-// autogenerated using string template disenumpart2.txt
-
     HARVEY (38, "Harvey"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** ROKS-2 */
-// autogenerated using string template disenumpart2.txt
-
     ROKS_2 (45, "ROKS-2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** ROKS-3 */
-// autogenerated using string template disenumpart2.txt
-
     TIME_SPACE_POSITION_INFORMATION (46, "ROKS-3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Type-93 */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "Type-93"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Type-100 */
-// autogenerated using string template disenumpart2.txt
-
-    CREATE_ENTITY_RELIABLE (51, "Type-100"),;
-
-// autogenerated using string template disenumpart25.txt
+    CREATE_ENTITY_RELIABLE (51, "Type-100");
 
     private int value;
     private final String description;
@@ -158,8 +93,6 @@ public enum LifeFormHumanSpecificFlameThrowers
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java
index 61c9833b598bf1c069ea15d889886b25882a9b2b..956a08de68c77f9e61a92529cefd080fec1fa02c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java
@@ -7,264 +7,95 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 515,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 515 marshal size 8<br>
  * LifeFormHumanSpecificGrenadeLaunchers
  */
 public enum LifeFormHumanSpecificGrenadeLaunchers 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x46mm Arsenal UGGL-M1 */
-// autogenerated using string template disenumpart2.txt
-
     _40X46MM_ARSENAL_UGGL_M1 (1, "40x46mm Arsenal UGGL-M1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x46mm Arsenal MSGL */
-// autogenerated using string template disenumpart2.txt
-
     _40X46MM_ARSENAL_MSGL (2, "40x46mm Arsenal MSGL"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40mm VOG Arsenal MSGL */
-// autogenerated using string template disenumpart2.txt
-
     _40MM_VOG_ARSENAL_MSGL (3, "40mm VOG Arsenal MSGL"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x46mm Arsenal UBGL-M16 */
-// autogenerated using string template disenumpart2.txt
-
     _40X46MM_ARSENAL_UBGL_M16 (4, "40x46mm Arsenal UBGL-M16"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x46mm Arsenal UBGL-M8 */
-// autogenerated using string template disenumpart2.txt
-
     _40X46MM_ARSENAL_UBGL_M8 (5, "40x46mm Arsenal UBGL-M8"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x46mm Arsenal UBGL-M7 */
-// autogenerated using string template disenumpart2.txt
-
     _40X46MM_ARSENAL_UBGL_M7 (6, "40x46mm Arsenal UBGL-M7"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 30mm BS-1 Tishina */
-// autogenerated using string template disenumpart2.txt
-
     _30MM_BS_1_TISHINA (10, "30mm BS-1 Tishina"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40mm BTS-203 */
-// autogenerated using string template disenumpart2.txt
-
     _40MM_BTS_203 (11, "40mm BTS-203"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40mm Indumil IMC-40 */
-// autogenerated using string template disenumpart2.txt
-
     _40MM_INDUMIL_IMC_40 (12, "40mm Indumil IMC-40"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40mm VOG BG-15 */
-// autogenerated using string template disenumpart2.txt
-
     _40MM_VOG_BG_15 (20, "40mm VOG BG-15"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40mm VOG GP-25 Kostoyor */
-// autogenerated using string template disenumpart2.txt
-
     _40MM_VOG_GP_25_KOSTOYOR (21, "40mm VOG GP-25 Kostoyor"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40mm VOG GP-30 Obuvka */
-// autogenerated using string template disenumpart2.txt
-
     _40MM_VOG_GP_30_OBUVKA (22, "40mm VOG GP-30 Obuvka"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40mm VOG GP-34 */
-// autogenerated using string template disenumpart2.txt
-
     _40MM_VOG_GP_34 (23, "40mm VOG GP-34"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40mm VOG RGM-40 Kastet */
-// autogenerated using string template disenumpart2.txt
-
     _40MM_VOG_RGM_40_KASTET (24, "40mm VOG RGM-40 Kastet"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40mm VOG RG-6 */
-// autogenerated using string template disenumpart2.txt
-
     _40MM_VOG_RG_6 (25, "40mm VOG RG-6"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x46mm M79 */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "40x46mm M79"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x46mm M203 */
-// autogenerated using string template disenumpart2.txt
-
     _40X46MM_M203 (31, "40x46mm M203"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x36mm M320 */
-// autogenerated using string template disenumpart2.txt
-
     _40X36MM_M320 (32, "40x36mm M320"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x46mm CIS 40 GL */
-// autogenerated using string template disenumpart2.txt
-
     _40X46MM_CIS_40_GL (35, "40x46mm CIS 40 GL"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x46mm EAGLE GL */
-// autogenerated using string template disenumpart2.txt
-
     _40X46MM_EAGLE_GL (36, "40x46mm EAGLE GL"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x46mm HK AG36 */
-// autogenerated using string template disenumpart2.txt
-
     _40X46MM_HK_AG36 (37, "40x46mm HK AG36"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x46mm HK AG-C/GLM */
-// autogenerated using string template disenumpart2.txt
-
     _40X46MM_HK_AG_C_GLM (38, "40x46mm HK AG-C/GLM"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x46mm HK69A1 */
-// autogenerated using string template disenumpart2.txt
-
     _40X46MM_HK69A1 (39, "40x46mm HK69A1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x46mm Beretta GLX 160 */
-// autogenerated using string template disenumpart2.txt
-
     _40X46MM_BERETTA_GLX_160 (40, "40x46mm Beretta GLX 160"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x46mm ARDE UBGL */
-// autogenerated using string template disenumpart2.txt
-
     _40X46MM_ARDE_UBGL (41, "40x46mm ARDE UBGL"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x46mm XML148 */
-// autogenerated using string template disenumpart2.txt
-
     _40X46MM_XML148 (42, "40x46mm XML148"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x46mm China Lake GL */
-// autogenerated using string template disenumpart2.txt
-
     _40X46MM_CHINA_LAKE_GL (43, "40x46mm China Lake GL"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x46mm Hawk MM-1 */
-// autogenerated using string template disenumpart2.txt
-
     _40X46MM_HAWK_MM_1 (44, "40x46mm Hawk MM-1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 25x40mm XM25 CDTE */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "25x40mm XM25 CDTE"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 37mm Milkor37/38 LL Stopper */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "37mm Milkor37/38 LL Stopper"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40mm Milkor40 GL */
-// autogenerated using string template disenumpart2.txt
-
     EVENT_REPORT_RELIABLE (61, "40mm Milkor40 GL"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40mm Milkor MGL */
-// autogenerated using string template disenumpart2.txt
-
     COMMENT_RELIABLE (62, "40mm Milkor MGL"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x47mm Pallad wz1974 */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_QUERY_RELIABLE (65, "40x47mm Pallad wz1974"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x47mm Pallad wz1983 */
-// autogenerated using string template disenumpart2.txt
-
     _40X47MM_PALLAD_WZ1983 (66, "40x47mm Pallad wz1983"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** UGL 200 Canister RWGL-3 */
-// autogenerated using string template disenumpart2.txt
-
     UGL_200_CANISTER_RWGL_3 (70, "UGL 200 Canister RWGL-3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 20x30mm ST Daewoo K11 */
-// autogenerated using string template disenumpart2.txt
-
     _20X30MM_ST_DAEWOO_K11 (80, "20x30mm ST Daewoo K11"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 35mm Type-91 BreechLoad GL */
-// autogenerated using string template disenumpart2.txt
-
     _35MM_TYPE_91_BREECHLOAD_GL (90, "35mm Type-91 BreechLoad GL"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x53mm CZW-40 */
-// autogenerated using string template disenumpart2.txt
-
     _40X53MM_CZW_40 (95, "40x53mm CZW-40"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 45mm DP-64 */
-// autogenerated using string template disenumpart2.txt
-
     _45MM_DP_64 (100, "45mm DP-64"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 20x42mm Neopup PAW-20 */
-// autogenerated using string template disenumpart2.txt
-
-    _20X42MM_NEOPUP_PAW_20 (105, "20x42mm Neopup PAW-20"),;
-
-// autogenerated using string template disenumpart25.txt
+    _20X42MM_NEOPUP_PAW_20 (105, "20x42mm Neopup PAW-20");
 
     private int value;
     private final String description;
@@ -314,8 +145,6 @@ public enum LifeFormHumanSpecificGrenadeLaunchers
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java
index 79c7b01ca1fbdea83ec069387ede1752fd81b60d..79fb60a084bce2fce6d675bff6440861c54cb675 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java
@@ -7,138 +7,53 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 517,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 517 marshal size 8<br>
  * LifeFormHumanSpecificGrenadeLaunchingMachineGun
  */
 public enum LifeFormHumanSpecificGrenadeLaunchingMachineGun 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x53mm HK GMG */
-// autogenerated using string template disenumpart2.txt
-
     _40X53MM_HK_GMG (20, "40x53mm HK GMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x53mm Mk47 Striker */
-// autogenerated using string template disenumpart2.txt
-
     _40X53MM_MK47_STRIKER (25, "40x53mm Mk47 Striker"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40mm M75 */
-// autogenerated using string template disenumpart2.txt
-
     _40MM_M75 (26, "40mm M75"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40mm M129 */
-// autogenerated using string template disenumpart2.txt
-
     _40MM_M129 (27, "40mm M129"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x46mm XM 174 */
-// autogenerated using string template disenumpart2.txt
-
     IDENTIFICATION_FRIEND_OR_FOE (28, "40x46mm XM 174"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x46mm Mk18 Mod 0 */
-// autogenerated using string template disenumpart2.txt
-
     _40X46MM_MK18_MOD_0 (29, "40x46mm Mk18 Mod 0"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x53mm Mk19 */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "40x53mm Mk19"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x46mm Mk20 Mod 0 */
-// autogenerated using string template disenumpart2.txt
-
     _40X46MM_MK20_MOD_0 (31, "40x46mm Mk20 Mod 0"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 30x29mm RAG-30/SAG-30 */
-// autogenerated using string template disenumpart2.txt
-
     _30X29MM_RAG_30_SAG_30 (40, "30x29mm RAG-30/SAG-30"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 30x29mm AGS-17 Plamya */
-// autogenerated using string template disenumpart2.txt
-
     _30X29MM_AGS_17_PLAMYA (41, "30x29mm AGS-17 Plamya"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 30x29mm AGS-30 Atlant */
-// autogenerated using string template disenumpart2.txt
-
     _30X29MM_AGS_30_ATLANT (42, "30x29mm AGS-30 Atlant"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40mm VOG AGS-40 Balkan */
-// autogenerated using string template disenumpart2.txt
-
     _40MM_VOG_AGS_40_BALKAN (43, "40mm VOG AGS-40 Balkan"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x53mm SB LAG 40 */
-// autogenerated using string template disenumpart2.txt
-
     _40X53MM_SB_LAG_40 (44, "40x53mm SB LAG 40"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x53mm Vektor Y3 */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "40x53mm Vektor Y3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x53mm CIS 40 */
-// autogenerated using string template disenumpart2.txt
-
     ACKNOWLEDGE_RELIABLE (55, "40x53mm CIS 40"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x56mm Howa Type-96 */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "40x56mm Howa Type-96"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 40x53mm Daewoo Precision Industries K4 */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_QUERY_RELIABLE (65, "40x53mm Daewoo Precision Industries K4"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 25x59mm XM307 Advanced Crew Served Weapon */
-// autogenerated using string template disenumpart2.txt
-
     _25X59MM_XM307_ADVANCED_CREW_SERVED_WEAPON (70, "25x59mm XM307 Advanced Crew Served Weapon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 35x32mm QLZ87 */
-// autogenerated using string template disenumpart2.txt
-
-    _35X32MM_QLZ87 (80, "35x32mm QLZ87"),;
-
-// autogenerated using string template disenumpart25.txt
+    _35X32MM_QLZ87 (80, "35x32mm QLZ87");
 
     private int value;
     private final String description;
@@ -188,8 +103,6 @@ public enum LifeFormHumanSpecificGrenadeLaunchingMachineGun
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHandGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHandGuns.java
index 7852045f0c56462445e25c7f7b5ea31e35dade3e..1bc224180d82c8ff25d38436afd3d649c1d1f645 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHandGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHandGuns.java
@@ -7,108 +7,43 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 513,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 513 marshal size 8<br>
  * LifeFormHumanSpecificHandGuns
  */
 public enum LifeFormHumanSpecificHandGuns 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.45mm PSM */
-// autogenerated using string template disenumpart2.txt
-
     _545MM_PSM (1, "5.45mm PSM"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9mm MK3 SLP */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "9mm MK3 SLP"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9mm Beretta 92S/92FS (M9) */
-// autogenerated using string template disenumpart2.txt
-
     _9MM_BERETTA_92S_92FS_M9 (31, "9mm Beretta 92S/92FS (M9)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9mm HandK USP */
-// autogenerated using string template disenumpart2.txt
-
     _9MM_HK_USP (32, "9mm H&K USP"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9mm Stechkin APS */
-// autogenerated using string template disenumpart2.txt
-
     _9MM_STECHKIN_APS (33, "9mm Stechkin APS"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9mm Makarov PM */
-// autogenerated using string template disenumpart2.txt
-
     _9MM_MAKAROV_PM (34, "9mm Makarov PM"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9mm Smith and Wesson SD (Sigma) */
-// autogenerated using string template disenumpart2.txt
-
     _9MM_SMITH_AND_WESSON_SD_SIGMA (35, "9mm Smith and Wesson SD (Sigma)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9mm Glock 17 */
-// autogenerated using string template disenumpart2.txt
-
     _9MM_GLOCK_17 (36, "9mm Glock 17"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9mm SIG Pro */
-// autogenerated using string template disenumpart2.txt
-
     _9MM_SIG_PRO (38, "9mm SIG Pro"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9mm Smith and Wesson SW1911 */
-// autogenerated using string template disenumpart2.txt
-
     _9MM_SMITH_AND_WESSON_SW1911 (39, "9mm Smith and Wesson SW1911"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9mm Smith and Wesson 5900-series */
-// autogenerated using string template disenumpart2.txt
-
     _9MM_SMITH_AND_WESSON_5900_SERIES (40, "9mm Smith and Wesson 5900-series"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** .45 Cal M1911 */
-// autogenerated using string template disenumpart2.txt
-
     _45_CAL_M1911 (41, ".45 Cal M1911"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9.07mm Ruger GP 100 */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "9.07mm Ruger GP 100"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 10mm Glock 20 */
-// autogenerated using string template disenumpart2.txt
-
-    DATA_RELIABLE (60, "10mm Glock 20"),;
-
-// autogenerated using string template disenumpart25.txt
+    DATA_RELIABLE (60, "10mm Glock 20");
 
     private int value;
     private final String description;
@@ -158,8 +93,6 @@ public enum LifeFormHumanSpecificHandGuns
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHighPowerRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHighPowerRifles.java
index b90bb73d333feebaf9eb64160cd43ad22d25c18a..d0163923dca8ef4fbd9680bd9a7b7a32fea8e249 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHighPowerRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHighPowerRifles.java
@@ -7,78 +7,33 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 475,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 475 marshal size 8<br>
  * LifeFormHumanSpecificHighPowerRifles
  */
 public enum LifeFormHumanSpecificHighPowerRifles 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm M14 */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_M14 (10, "7.62mm M14"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm Remington 700 */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_REMINGTON_700 (11, "7.62mm Remington 700"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm SIG-Sauer SSG-2000 */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_SIG_SAUER_SSG_2000 (12, "7.62mm SIG-Sauer SSG-2000"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm Stoner SR-25 */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_STONER_SR_25 (13, "7.62mm Stoner SR-25"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm Mosin-Nagant Model 1891/30 */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_MOSIN_NAGANT_MODEL_1891_30 (14, "7.62mm Mosin-Nagant Model 1891/30"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm HK417 */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_HK417 (15, "7.62mm HK417"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm HK417 16 Recce */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_HK417_16_RECCE (16, "7.62mm HK417 16 Recce"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.65mm BAR M1918 */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "7.65mm BAR M1918"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.65mm M1 Garand */
-// autogenerated using string template disenumpart2.txt
-
-    CREATE_ENTITY_RELIABLE (51, "7.65mm M1 Garand"),;
-
-// autogenerated using string template disenumpart25.txt
+    CREATE_ENTITY_RELIABLE (51, "7.65mm M1 Garand");
 
     private int value;
     private final String description;
@@ -128,8 +83,6 @@ public enum LifeFormHumanSpecificHighPowerRifles
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificLasersClass.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificLasersClass.java
index b6945b91802ed5917930a672c2c1a52494d2aaf6..cc704997a166bcaa99da013dad83e5fcad3320ec 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificLasersClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificLasersClass.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 527,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 527 marshal size 8<br>
  * LifeFormHumanSpecificLasersClass
  */
 public enum LifeFormHumanSpecificLasersClass 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Generic Laser Designator */
-// autogenerated using string template disenumpart2.txt
-
     GENERIC_LASER_DESIGNATOR (1, "Generic Laser Designator"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Generic Laser Pointer */
-// autogenerated using string template disenumpart2.txt
-
-    GENERIC_LASER_POINTER (2, "Generic Laser Pointer"),;
-
-// autogenerated using string template disenumpart25.txt
+    GENERIC_LASER_POINTER (2, "Generic Laser Pointer");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum LifeFormHumanSpecificLasersClass
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificLogisticsEQClass.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificLogisticsEQClass.java
index 461a853ab5a5546d28dc4ae908df9acabab55916..701b5dc699ba2cf4fb3c5df84bfef57681aba5cb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificLogisticsEQClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificLogisticsEQClass.java
@@ -7,24 +7,15 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 525,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 525 marshal size 8<br>
  * LifeFormHumanSpecificLogisticsEQClass
  */
 public enum LifeFormHumanSpecificLogisticsEQClass 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sling Load Pendant */
-// autogenerated using string template disenumpart2.txt
-
-    SLING_LOAD_PENDANT (1, "Sling Load Pendant"),;
-
-// autogenerated using string template disenumpart25.txt
+    SLING_LOAD_PENDANT (1, "Sling Load Pendant");
 
     private int value;
     private final String description;
@@ -74,8 +65,6 @@ public enum LifeFormHumanSpecificLogisticsEQClass
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMachineGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMachineGuns.java
index 681edd57267ff70ff2bb090067906c42ba150bc8..5361617269e21da9f9608158a64c0bdb6ffe87c1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMachineGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMachineGuns.java
@@ -7,540 +7,187 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 516,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 516 marshal size 8<br>
  * LifeFormHumanSpecificMachineGuns
  */
 public enum LifeFormHumanSpecificMachineGuns 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56x45mm XM214 Microgun Six-Pak */
-// autogenerated using string template disenumpart2.txt
-
     _556X45MM_XM214_MICROGUN_SIX_PAK (10, "5.56x45mm XM214 Microgun Six-Pak"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm M134/XM196 Minigun */
-// autogenerated using string template disenumpart2.txt
-
     _762X51MM_M134_XM196_MINIGUN (11, "7.62x51mm M134/XM196 Minigun"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56x45mm M249/FN Minimi SAW/LMG */
-// autogenerated using string template disenumpart2.txt
-
     _556X45MM_M249_FN_MINIMI_SAW_LMG (20, "5.56x45mm M249/FN Minimi SAW/LMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56x45mm FN Minimi Mk3 LMG */
-// autogenerated using string template disenumpart2.txt
-
     _556X45MM_FN_MINIMI_MK3_LMG (21, "5.56x45mm FN Minimi Mk3 LMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm FN Minimi 7.62 Mk3 GPMG */
-// autogenerated using string template disenumpart2.txt
-
     _762X51MM_FN_MINIMI_762_MK3_GPMG (22, "7.62x51mm FN Minimi 7.62 Mk3 GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x63mm M1941 Johnson */
-// autogenerated using string template disenumpart2.txt
-
     _762X63MM_M1941_JOHNSON (25, "7.62x63mm M1941 Johnson"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x63mm M1918 BAR */
-// autogenerated using string template disenumpart2.txt
-
     _762X63MM_M1918_BAR (26, "7.62x63mm M1918 BAR"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm M1919A4/Mk 21 Mod 0 Browning MMG */
-// autogenerated using string template disenumpart2.txt
-
     _762X51MM_M1919A4_MK_21_MOD_0_BROWNING_MMG (27, "7.62x51mm M1919A4/Mk 21 Mod 0 Browning MMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x63mm M1919A6 Browning MMG */
-// autogenerated using string template disenumpart2.txt
-
     IDENTIFICATION_FRIEND_OR_FOE (28, "7.62x63mm M1919A6 Browning MMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm M37 Browning MMG */
-// autogenerated using string template disenumpart2.txt
-
     _762X51MM_M37_BROWNING_MMG (29, "7.62x51mm M37 Browning MMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56x45mm Ares Shrike 5.56 LMG */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "5.56x45mm Ares Shrike 5.56 LMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56x45mm LSAT LMG */
-// autogenerated using string template disenumpart2.txt
-
     _556X45MM_LSAT_LMG (31, "5.56x45mm LSAT LMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56x45mm CMG-1 LMG */
-// autogenerated using string template disenumpart2.txt
-
     _556X45MM_CMG_1_LMG (32, "5.56x45mm CMG-1 LMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56x45mm CMG-2 LMG */
-// autogenerated using string template disenumpart2.txt
-
     _556X45MM_CMG_2_LMG (33, "5.56x45mm CMG-2 LMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56x45mm Stoner 63A LMG */
-// autogenerated using string template disenumpart2.txt
-
     _556X45MM_STONER_63A_LMG (34, "5.56x45mm Stoner 63A LMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56x45mm Ultimax 100 LMG */
-// autogenerated using string template disenumpart2.txt
-
     _556X45MM_ULTIMAX_100_LMG (35, "5.56x45mm Ultimax 100 LMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56x54mm Beretta AS70/90 LMG */
-// autogenerated using string template disenumpart2.txt
-
     _556X54MM_BERETTA_AS70_90_LMG (36, "5.56x54mm Beretta AS70/90 LMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56x45mm CETME Ameli LMG */
-// autogenerated using string template disenumpart2.txt
-
     _556X45MM_CETME_AMELI_LMG (37, "5.56x45mm CETME Ameli LMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56x45mm IMI Negev LMG */
-// autogenerated using string template disenumpart2.txt
-
     _556X45MM_IMI_NEGEV_LMG (38, "5.56x45mm IMI Negev LMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56x45mm INSAS LMG */
-// autogenerated using string template disenumpart2.txt
-
     _556X45MM_INSAS_LMG (39, "5.56x45mm INSAS LMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56x45mm AUG LMG */
-// autogenerated using string template disenumpart2.txt
-
     _556X45MM_AUG_LMG (40, "5.56x45mm AUG LMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56x45mm AUG HBAR LMG */
-// autogenerated using string template disenumpart2.txt
-
     _556X45MM_AUG_HBAR_LMG (41, "5.56x45mm AUG HBAR LMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56x45mm HK MG4 LMG */
-// autogenerated using string template disenumpart2.txt
-
     _556X45MM_HK_MG4_LMG (43, "5.56x45mm HK MG4 LMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56x45mm HK23/GR-9 LMG */
-// autogenerated using string template disenumpart2.txt
-
     _556X45MM_HK23_GR_9_LMG (44, "5.56x45mm HK23/GR-9 LMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56x45mm M27 IAR SAW */
-// autogenerated using string template disenumpart2.txt
-
     TIME_SPACE_POSITION_INFORMATION (46, "5.56x45mm M27 IAR SAW"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56x45mm L86 LSW */
-// autogenerated using string template disenumpart2.txt
-
     _556X45MM_L86_LSW (47, "5.56x45mm L86 LSW"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56x45mm Daewoo K3 LMG */
-// autogenerated using string template disenumpart2.txt
-
     _556X45MM_DAEWOO_K3_LMG (48, "5.56x45mm Daewoo K3 LMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56x45mm Vector Mini SS GPMG */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_FIRE (49, "5.56x45mm Vector Mini SS GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm M60 GPMG */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "7.62x51mm M60 GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm M60E3 GPMG */
-// autogenerated using string template disenumpart2.txt
-
     CREATE_ENTITY_RELIABLE (51, "7.62x51mm M60E3 GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm M60E4 GPMG */
-// autogenerated using string template disenumpart2.txt
-
     REMOVE_ENTITY_RELIABLE (52, "7.62x51mm M60E4 GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm M60E6 GPMG */
-// autogenerated using string template disenumpart2.txt
-
     START_RESUME_RELIABLE (53, "7.62x51mm M60E6 GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm Mark 48 GMPG */
-// autogenerated using string template disenumpart2.txt
-
     ACKNOWLEDGE_RELIABLE (55, "7.62x51mm Mark 48 GMPG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm M240/FN MAG 58 GPMG */
-// autogenerated using string template disenumpart2.txt
-
     DATA_QUERY_RELIABLE (58, "7.62x51mm M240/FN MAG 58 GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm M240E4/M240B GPMG */
-// autogenerated using string template disenumpart2.txt
-
     SET_DATA_RELIABLE (59, "7.62x51mm M240E4/M240B GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm M240E1/M240D GPMG */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "7.62x51mm M240E1/M240D GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm M240G GPMG */
-// autogenerated using string template disenumpart2.txt
-
     EVENT_REPORT_RELIABLE (61, "7.62x51mm M240G GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm M240E5/M240H GPMG */
-// autogenerated using string template disenumpart2.txt
-
     COMMENT_RELIABLE (62, "7.62x51mm M240E5/M240H GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm M240L GPMG */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_RELIABLE (63, "7.62x51mm M240L GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x39mm Kk 62 LMG */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_QUERY_RELIABLE (65, "7.62x39mm Kk 62 LMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm Vector SS-77 GPMG */
-// autogenerated using string template disenumpart2.txt
-
     _762X51MM_VECTOR_SS_77_GPMG (70, "7.62x51mm Vector SS-77 GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm SIG MG 710-3 GPMG */
-// autogenerated using string template disenumpart2.txt
-
     _762X51MM_SIG_MG_710_3_GPMG (71, "7.62x51mm SIG MG 710-3 GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm Sterling 7.62 GMPG */
-// autogenerated using string template disenumpart2.txt
-
     _762X51MM_STERLING_762_GMPG (72, "7.62x51mm Sterling 7.62 GMPG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm Sumitomo Type-62 GPMG */
-// autogenerated using string template disenumpart2.txt
-
     _762X51MM_SUMITOMO_TYPE_62_GPMG (73, "7.62x51mm Sumitomo Type-62 GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm Daewoo K12 GPMG */
-// autogenerated using string template disenumpart2.txt
-
     _762X51MM_DAEWOO_K12_GPMG (74, "7.62x51mm Daewoo K12 GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm MG 51 GPMG */
-// autogenerated using string template disenumpart2.txt
-
     _762X51MM_MG_51_GPMG (75, "7.62x51mm MG 51 GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm Rheinmetall MG 3 */
-// autogenerated using string template disenumpart2.txt
-
     _762X51MM_RHEINMETALL_MG_3 (76, "7.62x51mm Rheinmetall MG 3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm Rheinmetall MG 3KWS */
-// autogenerated using string template disenumpart2.txt
-
     _762X51MM_RHEINMETALL_MG_3KWS (77, "7.62x51mm Rheinmetall MG 3KWS"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm MG5/HK121 GPMG */
-// autogenerated using string template disenumpart2.txt
-
     _762X51MM_MG5_HK121_GPMG (80, "7.62x51mm MG5/HK121 GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm HK21 GPMG */
-// autogenerated using string template disenumpart2.txt
-
     _762X51MM_HK21_GPMG (81, "7.62x51mm HK21 GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm AA-52 GPMP */
-// autogenerated using string template disenumpart2.txt
-
     _762X51MM_AA_52_GPMP (85, "7.62x51mm AA-52 GPMP"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm UKM-2000 GPMG */
-// autogenerated using string template disenumpart2.txt
-
     _762X51MM_UKM_2000_GPMG (86, "7.62x51mm UKM-2000 GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x54mm Uk vz. 59 GPMG */
-// autogenerated using string template disenumpart2.txt
-
     _762X54MM_UK_VZ_59_GPMG (88, "7.62x54mm Uk vz. 59 GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.92x57mm MG 42 GPMG */
-// autogenerated using string template disenumpart2.txt
-
     _792X57MM_MG_42_GPMG (89, "7.92x57mm MG 42 GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 12.7x99mm M2A1 Browning HMG */
-// autogenerated using string template disenumpart2.txt
-
     _127X99MM_M2A1_BROWNING_HMG (100, "12.7x99mm M2A1 Browning HMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 12.7x99mm M2HB Browning HMG */
-// autogenerated using string template disenumpart2.txt
-
     _127X99MM_M2HB_BROWNING_HMG (101, "12.7x99mm M2HB Browning HMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 12.7x99mm M2HB-QCB Browning HMG */
-// autogenerated using string template disenumpart2.txt
-
     _127X99MM_M2HB_QCB_BROWNING_HMG (102, "12.7x99mm M2HB-QCB Browning HMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 12.7x99mm M85C HMG */
-// autogenerated using string template disenumpart2.txt
-
     _127X99MM_M85C_HMG (105, "12.7x99mm M85C HMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 12.7x99mm Rheinmetall RMG.50 HMG */
-// autogenerated using string template disenumpart2.txt
-
     _127X99MM_RHEINMETALL_RMG50_HMG (108, "12.7x99mm Rheinmetall RMG.50 HMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 12.7x99mm HK25 HMG */
-// autogenerated using string template disenumpart2.txt
-
     _127X99MM_HK25_HMG (110, "12.7x99mm HK25 HMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 12.7x99mm CIS 50MG */
-// autogenerated using string template disenumpart2.txt
-
     _127X99MM_CIS_50MG (112, "12.7x99mm CIS 50MG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.45x39mm IP-2 LMG */
-// autogenerated using string template disenumpart2.txt
-
     _545X39MM_IP_2_LMG (120, "5.45x39mm IP-2 LMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.45x39mm Nikonov LMG */
-// autogenerated using string template disenumpart2.txt
-
     _545X39MM_NIKONOV_LMG (121, "5.45x39mm Nikonov LMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.45x39mm M74 RPK */
-// autogenerated using string template disenumpart2.txt
-
     _545X39MM_M74_RPK (122, "5.45x39mm M74 RPK"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x39mm M43 RPK */
-// autogenerated using string template disenumpart2.txt
-
     _762X39MM_M43_RPK (125, "7.62x39mm M43 RPK"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x39mm RPD SAW */
-// autogenerated using string template disenumpart2.txt
-
     _762X39MM_RPD_SAW (126, "7.62x39mm RPD SAW"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x39mm Zastava M72 */
-// autogenerated using string template disenumpart2.txt
-
     _762X39MM_ZASTAVA_M72 (127, "7.62x39mm Zastava M72"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x39mm Type-81 LMG */
-// autogenerated using string template disenumpart2.txt
-
     _762X39MM_TYPE_81_LMG (128, "7.62x39mm Type-81 LMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x51mm Zastava M77 */
-// autogenerated using string template disenumpart2.txt
-
     _762X51MM_ZASTAVA_M77 (135, "7.62x51mm Zastava M77"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x54mm PK GPMG */
-// autogenerated using string template disenumpart2.txt
-
     _762X54MM_PK_GPMG (140, "7.62x54mm PK GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x54mm AEK-999 GPMP */
-// autogenerated using string template disenumpart2.txt
-
     _762X54MM_AEK_999_GPMP (141, "7.62x54mm AEK-999 GPMP"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x54mm Pecheneg GPMG */
-// autogenerated using string template disenumpart2.txt
-
     _762X54MM_PECHENEG_GPMG (142, "7.62x54mm Pecheneg GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x54mm Zastava M84 */
-// autogenerated using string template disenumpart2.txt
-
     _762X54MM_ZASTAVA_M84 (143, "7.62x54mm Zastava M84"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x54mm Type-67 GPMG */
-// autogenerated using string template disenumpart2.txt
-
     _762X54MM_TYPE_67_GPMG (144, "7.62x54mm Type-67 GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62x54mm Type-80 GPMG */
-// autogenerated using string template disenumpart2.txt
-
     _762X54MM_TYPE_80_GPMG (145, "7.62x54mm Type-80 GPMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 12.7x108mm NSV HMG */
-// autogenerated using string template disenumpart2.txt
-
     _127X108MM_NSV_HMG (150, "12.7x108mm NSV HMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 12.7x108mm Kord HMG */
-// autogenerated using string template disenumpart2.txt
-
     _127X108MM_KORD_HMG (151, "12.7x108mm Kord HMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 12.7x108mm KPD-12.7 HMG */
-// autogenerated using string template disenumpart2.txt
-
     _127X108MM_KPD_127_HMG (152, "12.7x108mm KPD-12.7 HMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 12.7x108mm Zastava M02 Coyotoe HMG */
-// autogenerated using string template disenumpart2.txt
-
     _127X108MM_ZASTAVA_M02_COYOTOE_HMG (153, "12.7x108mm Zastava M02 Coyotoe HMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 12.7x108mm Zastava M87 */
-// autogenerated using string template disenumpart2.txt
-
     _127X108MM_ZASTAVA_M87 (154, "12.7x108mm Zastava M87"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 12.7x108mm Type-77 HMG */
-// autogenerated using string template disenumpart2.txt
-
     _127X108MM_TYPE_77_HMG (155, "12.7x108mm Type-77 HMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 12.7x108mm W85 HMG */
-// autogenerated using string template disenumpart2.txt
-
     _127X108MM_W85_HMG (156, "12.7x108mm W85 HMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 12.7x108mm Type-90 HMG */
-// autogenerated using string template disenumpart2.txt
-
     _127X108MM_TYPE_90_HMG (157, "12.7x108mm Type-90 HMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.8x42mm QJY-88 LMG */
-// autogenerated using string template disenumpart2.txt
-
     _58X42MM_QJY_88_LMG (164, "5.8x42mm QJY-88 LMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.8x42mm QBB-95 DBP87 LMG */
-// autogenerated using string template disenumpart2.txt
-
     _58X42MM_QBB_95_DBP87_LMG (165, "5.8x42mm QBB-95 DBP87 LMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56x45mm QBB-95-1 LMG */
-// autogenerated using string template disenumpart2.txt
-
-    _556X45MM_QBB_95_1_LMG (166, "5.56x45mm QBB-95-1 LMG"),;
-
-// autogenerated using string template disenumpart25.txt
+    _556X45MM_QBB_95_1_LMG (166, "5.56x45mm QBB-95-1 LMG");
 
     private int value;
     private final String description;
@@ -590,8 +237,6 @@ public enum LifeFormHumanSpecificMachineGuns
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java
index 4e3b0e3976415075fc54ee2ed18334b2be31ffea..ef0a2aafc1eb99879dd26fcc6da4c3bd029c7f40 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java
@@ -7,156 +7,59 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 520,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 520 marshal size 8<br>
  * LifeFormHumanSpecificManPortableAirDefenseSystem
  */
 public enum LifeFormHumanSpecificManPortableAirDefenseSystem 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 70mm FIM-43 Redeye */
-// autogenerated using string template disenumpart2.txt
-
     _70MM_FIM_43_REDEYE (1, "70mm FIM-43 Redeye"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 70mm FIM-92 Stinger */
-// autogenerated using string template disenumpart2.txt
-
     _70MM_FIM_92_STINGER (2, "70mm FIM-92 Stinger"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 76mm Blowpipe */
-// autogenerated using string template disenumpart2.txt
-
     _76MM_BLOWPIPE (10, "76mm Blowpipe"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 76mm Starburst (Javelin S-15) */
-// autogenerated using string template disenumpart2.txt
-
     _76MM_STARBURST_JAVELIN_S_15 (11, "76mm Starburst (Javelin S-15)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 130mm Starstreak HVM */
-// autogenerated using string template disenumpart2.txt
-
     _130MM_STARSTREAK_HVM (12, "130mm Starstreak HVM"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 90mm Mistral */
-// autogenerated using string template disenumpart2.txt
-
     _90MM_MISTRAL (15, "90mm Mistral"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 72mm 9K32M Strela-2 (SA-7) */
-// autogenerated using string template disenumpart2.txt
-
     _72MM_9K32M_STRELA_2_SA_7 (20, "72mm 9K32M Strela-2 (SA-7)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 72mm 9K36 Strela-3 (SA-14) */
-// autogenerated using string template disenumpart2.txt
-
     _72MM_9K36_STRELA_3_SA_14 (21, "72mm 9K36 Strela-3 (SA-14)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 72mm 9K38 Igla (SA-18) */
-// autogenerated using string template disenumpart2.txt
-
     _72MM_9K38_IGLA_SA_18 (22, "72mm 9K38 Igla (SA-18)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 72mm 9K310 Igla-M (SA-16) */
-// autogenerated using string template disenumpart2.txt
-
     _72MM_9K310_IGLA_M_SA_16 (23, "72mm 9K310 Igla-M (SA-16)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 72mm 9K333 Verba (SA-25) */
-// autogenerated using string template disenumpart2.txt
-
     _72MM_9K333_VERBA_SA_25 (24, "72mm 9K333 Verba (SA-25)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 72mm 9K338 Igla-S (SA-24 Grinch) */
-// autogenerated using string template disenumpart2.txt
-
     _72MM_9K338_IGLA_S_SA_24_GRINCH (25, "72mm 9K338 Igla-S (SA-24 Grinch)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 72mm HN-5 Hong-Ying-5 */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "72mm HN-5 Hong-Ying-5"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 72mm QW-1 Vanguard */
-// autogenerated using string template disenumpart2.txt
-
     _72MM_QW_1_VANGUARD (31, "72mm QW-1 Vanguard"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 72mm QW-2 Vanguard 2 */
-// autogenerated using string template disenumpart2.txt
-
     _72MM_QW_2_VANGUARD_2 (32, "72mm QW-2 Vanguard 2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 90mm QW-3 */
-// autogenerated using string template disenumpart2.txt
-
     _90MM_QW_3 (33, "90mm QW-3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 72mm FN-6 */
-// autogenerated using string template disenumpart2.txt
-
     _72MM_FN_6 (34, "72mm FN-6"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 71mm Misagh-1 */
-// autogenerated using string template disenumpart2.txt
-
     _71MM_MISAGH_1 (45, "71mm Misagh-1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 71mm Misagh-2 */
-// autogenerated using string template disenumpart2.txt
-
     TIME_SPACE_POSITION_INFORMATION (46, "71mm Misagh-2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 80mm Type-91 Kin-SAM */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "80mm Type-91 Kin-SAM"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 80mm KP-SAM Shun-Gung (Chiron) */
-// autogenerated using string template disenumpart2.txt
-
     ACKNOWLEDGE_RELIABLE (55, "80mm KP-SAM Shun-Gung (Chiron)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 106mm RBS-70 */
-// autogenerated using string template disenumpart2.txt
-
-    DATA_RELIABLE (60, "106mm RBS-70"),;
-
-// autogenerated using string template disenumpart25.txt
+    DATA_RELIABLE (60, "106mm RBS-70");
 
     private int value;
     private final String description;
@@ -206,8 +109,6 @@ public enum LifeFormHumanSpecificManPortableAirDefenseSystem
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMortars.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMortars.java
index 1a7574197b0411def74eb98656362c9a3f4ff84b..e5eed9348f3d292a2fb29098f8cc5fe7ccb6c0a1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMortars.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMortars.java
@@ -7,48 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 512,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 512 marshal size 8<br>
  * LifeFormHumanSpecificMortars
  */
 public enum LifeFormHumanSpecificMortars 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Others */
-// autogenerated using string template disenumpart2.txt
-
     OTHERS (0, "Others"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 60mm M224 */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "60mm M224"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 81mm F2 */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "81mm F2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 81mm L16 */
-// autogenerated using string template disenumpart2.txt
-
     CREATE_ENTITY_RELIABLE (51, "81mm L16"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 81mm M252 */
-// autogenerated using string template disenumpart2.txt
-
-    REMOVE_ENTITY_RELIABLE (52, "81mm M252"),;
-
-// autogenerated using string template disenumpart25.txt
+    REMOVE_ENTITY_RELIABLE (52, "81mm M252");
 
     private int value;
     private final String description;
@@ -98,8 +73,6 @@ public enum LifeFormHumanSpecificMortars
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificPersonalElectronicsClass.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificPersonalElectronicsClass.java
index 9317e22c25f303426c29942373b3bc4ecab4d3d4..8d8eb9f863ca472191edb01bca35a2bc24821587 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificPersonalElectronicsClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificPersonalElectronicsClass.java
@@ -7,24 +7,15 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 526,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 526 marshal size 8<br>
  * LifeFormHumanSpecificPersonalElectronicsClass
  */
 public enum LifeFormHumanSpecificPersonalElectronicsClass 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cell Phone */
-// autogenerated using string template disenumpart2.txt
-
-    CELL_PHONE (1, "Cell Phone"),;
-
-// autogenerated using string template disenumpart25.txt
+    CELL_PHONE (1, "Cell Phone");
 
     private int value;
     private final String description;
@@ -74,8 +65,6 @@ public enum LifeFormHumanSpecificPersonalElectronicsClass
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificRecoillessRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificRecoillessRifles.java
index 3a4b9bc7bb681a208aae06cf80720cf191ab3323..b3b8a5c62501eb699cf91789a9e1ff12caf58491 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificRecoillessRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificRecoillessRifles.java
@@ -7,192 +7,71 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 521,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 521 marshal size 8<br>
  * LifeFormHumanSpecificRecoillessRifles
  */
 public enum LifeFormHumanSpecificRecoillessRifles 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 84mm M136 AT-4 CS */
-// autogenerated using string template disenumpart2.txt
-
     _84MM_M136_AT_4_CS (15, "84mm M136 AT-4 CS"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 57mm M18 RR */
-// autogenerated using string template disenumpart2.txt
-
     _57MM_M18_RR (20, "57mm M18 RR"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 75mm M20 RR */
-// autogenerated using string template disenumpart2.txt
-
     _75MM_M20_RR (21, "75mm M20 RR"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 120mm M-28 Davy Crockett */
-// autogenerated using string template disenumpart2.txt
-
     _120MM_M_28_DAVY_CROCKETT (22, "120mm M-28 Davy Crockett"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 155mm M-29 Davy Crockett */
-// autogenerated using string template disenumpart2.txt
-
     _155MM_M_29_DAVY_CROCKETT (23, "155mm M-29 Davy Crockett"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 106mm M40 Recoilless Rifle */
-// autogenerated using string template disenumpart2.txt
-
     _106MM_M40_RECOILLESS_RIFLE (24, "106mm M40 Recoilless Rifle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 82mm M60 RR */
-// autogenerated using string template disenumpart2.txt
-
     _82MM_M60_RR (25, "82mm M60 RR"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 90mm M67 RR */
-// autogenerated using string template disenumpart2.txt
-
     _90MM_M67_RR (26, "90mm M67 RR"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 84mm M1 Carl Gustav */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "84mm M1 Carl Gustav"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 84mm M2 Carl Gustav */
-// autogenerated using string template disenumpart2.txt
-
     _84MM_M2_CARL_GUSTAV (31, "84mm M2 Carl Gustav"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 84mm M3 Carl Gustav */
-// autogenerated using string template disenumpart2.txt
-
     _84MM_M3_CARL_GUSTAV (32, "84mm M3 Carl Gustav"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 84mm M4 Carl Gustav */
-// autogenerated using string template disenumpart2.txt
-
     _84MM_M4_CARL_GUSTAV (33, "84mm M4 Carl Gustav"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 74mm Pansarskott m/68 Miniman */
-// autogenerated using string template disenumpart2.txt
-
     _74MM_PANSARSKOTT_M_68_MINIMAN (35, "74mm Pansarskott m/68 Miniman"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 84mm ALAC */
-// autogenerated using string template disenumpart2.txt
-
     _84MM_ALAC (40, "84mm ALAC"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 82mm B-10 RR */
-// autogenerated using string template disenumpart2.txt
-
     _82MM_B_10_RR (45, "82mm B-10 RR"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 107mm B-11 RR */
-// autogenerated using string template disenumpart2.txt
-
     TIME_SPACE_POSITION_INFORMATION (46, "107mm B-11 RR"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 80mm Breda Folgore */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "80mm Breda Folgore"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 120mm BAT RR */
-// autogenerated using string template disenumpart2.txt
-
     ACKNOWLEDGE_RELIABLE (55, "120mm BAT RR"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 73mm SPG-9 Kopye */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "73mm SPG-9 Kopye"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 88mm RCL 3.45in */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_QUERY_RELIABLE (65, "88mm RCL 3.45in"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 90mm Pvpj 110 */
-// autogenerated using string template disenumpart2.txt
-
     _90MM_PVPJ_110 (70, "90mm Pvpj 110"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 50mm Jagdfaust */
-// autogenerated using string template disenumpart2.txt
-
     _50MM_JAGDFAUST (75, "50mm Jagdfaust"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 30mm Rheinmetall RMK30 */
-// autogenerated using string template disenumpart2.txt
-
     _30MM_RHEINMETALL_RMK30 (80, "30mm Rheinmetall RMK30"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 88mm 55 S 55 Raikka */
-// autogenerated using string template disenumpart2.txt
-
     _88MM_55_S_55_RAIKKA (90, "88mm 55 S 55 Raikka"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 95mm 95 S 58-61 */
-// autogenerated using string template disenumpart2.txt
-
     _95MM_95_S_58_61 (91, "95mm 95 S 58-61"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 73mm LG40 */
-// autogenerated using string template disenumpart2.txt
-
     _73MM_LG40 (95, "73mm LG40"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 105mm LG40 */
-// autogenerated using string template disenumpart2.txt
-
     _105MM_LG40 (96, "105mm LG40"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 105mm LG42 */
-// autogenerated using string template disenumpart2.txt
-
-    _105MM_LG42 (97, "105mm LG42"),;
-
-// autogenerated using string template disenumpart25.txt
+    _105MM_LG42 (97, "105mm LG42");
 
     private int value;
     private final String description;
@@ -242,8 +121,6 @@ public enum LifeFormHumanSpecificRecoillessRifles
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificShotGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificShotGuns.java
index 506a12f43e6a24ed4f3c99bf5979473e6a7e64d9..0e5f2ac1a7a7ed97742a9235a55b90cb5cc57686 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificShotGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificShotGuns.java
@@ -7,852 +7,291 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 511,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 511 marshal size 8<br>
  * LifeFormHumanSpecificShotGuns
  */
 public enum LifeFormHumanSpecificShotGuns 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Browning Superposed O/U */
-// autogenerated using string template disenumpart2.txt
-
     BROWNING_SUPERPOSED_O_U (20, "Browning Superposed O/U"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Browning Cynergy */
-// autogenerated using string template disenumpart2.txt
-
     BROWNING_CYNERGY (21, "Browning Cynergy"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Browning Auto-5 */
-// autogenerated using string template disenumpart2.txt
-
     BROWNING_AUTO_5 (22, "Browning Auto-5"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Browning Citori O/U 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_BROWNING_CITORI_O_U_12_GAUGE (23, "18.5mm Browning Citori O/U 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 16.8mm Browning Citori O/U 16 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _168MM_BROWNING_CITORI_O_U_16_GAUGE (24, "16.8mm Browning Citori O/U 16 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 15.6mm Browning Citori O/U 20 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _156MM_BROWNING_CITORI_O_U_20_GAUGE (25, "15.6mm Browning Citori O/U 20 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 14mm Browning Citori O/U 28 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _14MM_BROWNING_CITORI_O_U_28_GAUGE (26, "14mm Browning Citori O/U 28 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 10.4mm Browning Citori O/U .410 Bore */
-// autogenerated using string template disenumpart2.txt
-
     _104MM_BROWNING_CITORI_O_U_410_BORE (27, "10.4mm Browning Citori O/U .410 Bore"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Browning Double Automatic 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     IDENTIFICATION_FRIEND_OR_FOE (28, "18.5mm Browning Double Automatic 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Ithaca 37 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_ITHACA_37_12_GAUGE (29, "18.5mm Ithaca 37 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 16.8mm Ithaca 37 16 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "16.8mm Ithaca 37 16 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 15.6mm Ithaca 37 20 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _156MM_ITHACA_37_20_GAUGE (31, "15.6mm Ithaca 37 20 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 14mm Ithaca 37 28 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _14MM_ITHACA_37_28_GAUGE (32, "14mm Ithaca 37 28 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 19.7mm Ithaca Mag-10 SA 10 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _197MM_ITHACA_MAG_10_SA_10_GAUGE (33, "19.7mm Ithaca Mag-10 SA 10 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 19.7mm Marlin Model 55 10 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _197MM_MARLIN_MODEL_55_10_GAUGE (34, "19.7mm Marlin Model 55 10 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Marlin Model 55 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_MARLIN_MODEL_55_12_GAUGE (35, "18.5mm Marlin Model 55 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 16.8mm Marlin Model 55 16 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _168MM_MARLIN_MODEL_55_16_GAUGE (36, "16.8mm Marlin Model 55 16 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 15.6mm Marlin Model 55 20 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _156MM_MARLIN_MODEL_55_20_GAUGE (37, "15.6mm Marlin Model 55 20 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Mossberg 500 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_MOSSBERG_500_12_GAUGE (38, "18.5mm Mossberg 500 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 15.6mm Mossberg 500 20 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _156MM_MOSSBERG_500_20_GAUGE (39, "15.6mm Mossberg 500 20 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 10.4mm Mossberg 500 .410 Bore */
-// autogenerated using string template disenumpart2.txt
-
     _104MM_MOSSBERG_500_410_BORE (40, "10.4mm Mossberg 500 .410 Bore"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Mossberg 590 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_MOSSBERG_590_12_GAUGE (41, "18.5mm Mossberg 590 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 15.6mm Mossberg 590 20 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _156MM_MOSSBERG_590_20_GAUGE (42, "15.6mm Mossberg 590 20 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 10.4mm Mossberg 590 .410 Bore */
-// autogenerated using string template disenumpart2.txt
-
     _104MM_MOSSBERG_590_410_BORE (43, "10.4mm Mossberg 590 .410 Bore"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Mossberg 930 SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_MOSSBERG_930_SA_12_GAUGE (44, "18.5mm Mossberg 930 SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Remington Model 11 SA */
-// autogenerated using string template disenumpart2.txt
-
     REMINGTON_MODEL_11_SA (45, "Remington Model 11 SA"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Remington Model 10 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     TIME_SPACE_POSITION_INFORMATION (46, "Remington Model 10 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 15.6mm Remington Model 17 20 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _156MM_REMINGTON_MODEL_17_20_GAUGE (47, "15.6mm Remington Model 17 20 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Remington Model 31 */
-// autogenerated using string template disenumpart2.txt
-
     REMINGTON_MODEL_31 (48, "Remington Model 31"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Remington Model 11-48 SA */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_FIRE (49, "Remington Model 11-48 SA"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Remington 870 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "18.5mm Remington 870 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 16.8mm Remington 870 16 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     CREATE_ENTITY_RELIABLE (51, "16.8mm Remington 870 16 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 15.6mm Remington 870 20 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     REMOVE_ENTITY_RELIABLE (52, "15.6mm Remington 870 20 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 14mm Remington 870 28 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     START_RESUME_RELIABLE (53, "14mm Remington 870 28 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 10.4mm Remington 870 .410 Bore */
-// autogenerated using string template disenumpart2.txt
-
     STOP_FREEZE_RELIABLE (54, "10.4mm Remington 870 .410 Bore"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Remington Model 58 SA */
-// autogenerated using string template disenumpart2.txt
-
     ACKNOWLEDGE_RELIABLE (55, "Remington Model 58 SA"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Remington 878 SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     ACTION_REQUEST_RELIABLE (56, "18.5mm Remington 878 SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Remington Model 1100 SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     ACTION_RESPONSE_RELIABLE (57, "18.5mm Remington Model 1100 SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 16.8mm Remington Model 1100 SA 16 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     DATA_QUERY_RELIABLE (58, "16.8mm Remington Model 1100 SA 16 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 15.6mm Remington Model 1100 SA 20 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     SET_DATA_RELIABLE (59, "15.6mm Remington Model 1100 SA 20 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 14mm Remington Model 1100 SA 28 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "14mm Remington Model 1100 SA 28 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 10.4mm Remington Model 1100 SA .410 Bore */
-// autogenerated using string template disenumpart2.txt
-
     EVENT_REPORT_RELIABLE (61, "10.4mm Remington Model 1100 SA .410 Bore"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Remington 11-87 SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     COMMENT_RELIABLE (62, "18.5mm Remington 11-87 SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 15.6mm Remington 11-87 SA 20 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_RELIABLE (63, "15.6mm Remington 11-87 SA 20 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 19.7mm Remington Model SP-10 SA 10 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     SET_RECORD_RELIABLE	 (64, "19.7mm Remington Model SP-10 SA 10 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Remington 887 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_QUERY_RELIABLE (65, "18.5mm Remington 887 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Remington Sparta 100 SxS 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_REMINGTON_SPARTA_100_SXS_12_GAUGE (70, "18.5mm Remington Sparta 100 SxS 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 15.6mm Remington Sparta 100 SxS 20 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _156MM_REMINGTON_SPARTA_100_SXS_20_GAUGE (71, "15.6mm Remington Sparta 100 SxS 20 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 10.4mm Remington Sparta 100 SxS .410 Bore */
-// autogenerated using string template disenumpart2.txt
-
     _104MM_REMINGTON_SPARTA_100_SXS_410_BORE (72, "10.4mm Remington Sparta 100 SxS .410 Bore"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Remington Spartan 310 O/U 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_REMINGTON_SPARTAN_310_O_U_12_GAUGE (73, "18.5mm Remington Spartan 310 O/U 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 15.6mm Remington Spartan 310 O/U 20 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _156MM_REMINGTON_SPARTAN_310_O_U_20_GAUGE (74, "15.6mm Remington Spartan 310 O/U 20 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 14mm Remington Spartan 310 O/U 28 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _14MM_REMINGTON_SPARTAN_310_O_U_28_GAUGE (75, "14mm Remington Spartan 310 O/U 28 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 10.4mm Remington Spartan 310 O/U .410 Bore */
-// autogenerated using string template disenumpart2.txt
-
     _104MM_REMINGTON_SPARTAN_310_O_U_410_BORE (76, "10.4mm Remington Spartan 310 O/U .410 Bore"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Remington Spartan 453 SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_REMINGTON_SPARTAN_453_SA_12_GAUGE (77, "18.5mm Remington Spartan 453 SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Winchester Model 1200 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_WINCHESTER_MODEL_1200_12_GAUGE (80, "18.5mm Winchester Model 1200 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 16.8mm Winchester Model 1200 16 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _168MM_WINCHESTER_MODEL_1200_16_GAUGE (81, "16.8mm Winchester Model 1200 16 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 15.6mm Winchester Model 1200 20 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _156MM_WINCHESTER_MODEL_1200_20_GAUGE (82, "15.6mm Winchester Model 1200 20 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Winchester Model 1887/1901 */
-// autogenerated using string template disenumpart2.txt
-
     WINCHESTER_MODEL_1887_1901 (83, "Winchester Model 1887/1901"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Winchester Model 1897 */
-// autogenerated using string template disenumpart2.txt
-
     WINCHESTER_MODEL_1897 (84, "Winchester Model 1897"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Winchester Model 1912 */
-// autogenerated using string template disenumpart2.txt
-
     WINCHESTER_MODEL_1912 (85, "Winchester Model 1912"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Winchester Model 21 SxS */
-// autogenerated using string template disenumpart2.txt
-
     WINCHESTER_MODEL_21_SXS (86, "Winchester Model 21 SxS"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Winchester Model 37 SxS */
-// autogenerated using string template disenumpart2.txt
-
     WINCHESTER_MODEL_37_SXS (87, "Winchester Model 37 SxS"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm HR Ultraslug SxS 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_HR_ULTRASLUG_SXS_12_GAUGE (88, "18.5mm HR Ultraslug SxS 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 15.6mm HR Ultraslug SxS 20 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _156MM_HR_ULTRASLUG_SXS_20_GAUGE (89, "15.6mm HR Ultraslug SxS 20 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Ciener Ultimate O/U 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_CIENER_ULTIMATE_O_U_12_GAUGE (90, "18.5mm Ciener Ultimate O/U 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Coach Gun SxS Double Barrel 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_COACH_GUN_SXS_DOUBLE_BARREL_12_GAUGE (91, "18.5mm Coach Gun SxS Double Barrel 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Ruger Gold Label SxS 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_RUGER_GOLD_LABEL_SXS_12_GAUGE (92, "18.5mm Ruger Gold Label SxS 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm High Standard Model 10 SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_HIGH_STANDARD_MODEL_10_SA_12_GAUGE (93, "18.5mm High Standard Model 10 SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Kel-Tex KSG 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_KEL_TEX_KSG_12_GAUGE (94, "18.5mm Kel-Tex KSG 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5 KAC Masterkey 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185_KAC_MASTERKEY_12_GAUGE (95, "18.5 KAC Masterkey 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm M26 M.A.S.S. 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_M26_MASS_12_GAUGE (96, "18.5mm M26 M.A.S.S. 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm SRM Arms M1216 SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_SRM_ARMS_M1216_SA_12_GAUGE (97, "18.5mm SRM Arms M1216 SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm AA-12 FA Atchisson Assault */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_AA_12_FA_ATCHISSON_ASSAULT (98, "18.5mm AA-12 FA Atchisson Assault"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Pancor Jackhammer FA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_PANCOR_JACKHAMMER_FA_12_GAUGE (99, "18.5mm Pancor Jackhammer FA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm USAS-12 FA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_USAS_12_FA_12_GAUGE (110, "18.5mm USAS-12 FA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm MAUL SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_MAUL_SA_12_GAUGE (111, "18.5mm MAUL SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm FN SLP SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_FN_SLP_SA_12_GAUGE (112, "18.5mm FN SLP SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm FN TPS 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_FN_TPS_12_GAUGE (113, "18.5mm FN TPS 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm ENARM Pentagun SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_ENARM_PENTAGUN_SA_12_GAUGE (115, "18.5mm ENARM Pentagun SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Stevens Model 520/620 */
-// autogenerated using string template disenumpart2.txt
-
     STEVENS_MODEL_520_620 (116, "Stevens Model 520/620"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Stoeger Coach Gun SxS */
-// autogenerated using string template disenumpart2.txt
-
     STOEGER_COACH_GUN_SXS (117, "Stoeger Coach Gun SxS"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Stoeger Condor O/U */
-// autogenerated using string template disenumpart2.txt
-
     STOEGER_CONDOR_O_U (118, "Stoeger Condor O/U"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Armscor Model 30 SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_ARMSCOR_MODEL_30_SA_12_GAUGE (120, "18.5mm Armscor Model 30 SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Weatherby SA-08 SA */
-// autogenerated using string template disenumpart2.txt
-
     WEATHERBY_SA_08_SA (121, "Weatherby SA-08 SA"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Fabarm SDASS Tactical 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_FABARM_SDASS_TACTICAL_12_GAUGE (122, "18.5mm Fabarm SDASS Tactical 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm MAG-7 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_MAG_7_12_GAUGE (123, "18.5mm MAG-7 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Neostead 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_NEOSTEAD_12_GAUGE (124, "18.5mm Neostead 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Armsel Striker SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_ARMSEL_STRIKER_SA_12_GAUGE (125, "18.5mm Armsel Striker SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Parker Hale Rogun SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_PARKER_HALE_ROGUN_SA_12_GAUGE (127, "18.5mm Parker Hale Rogun SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 26mm RGA-86 Revolver */
-// autogenerated using string template disenumpart2.txt
-
     _26MM_RGA_86_REVOLVER (130, "26mm RGA-86 Revolver"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Sjorgren SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_SJORGREN_SA_12_GAUGE (131, "18.5mm Sjorgren SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Akdal MKA 1919 SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_AKDAL_MKA_1919_SA_12_GAUGE (132, "18.5mm Akdal MKA 1919 SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Retay Masai Mara SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_RETAY_MASAI_MARA_SA_12_GAUGE (133, "18.5mm Retay Masai Mara SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Safir T-14 SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_SAFIR_T_14_SA_12_GAUGE (134, "18.5mm Safir T-14 SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Benelli M1 Super 90 SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_BENELLI_M1_SUPER_90_SA_12_GAUGE (150, "18.5mm Benelli M1 Super 90 SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 15.6mm Benelli M1 Super 90 SA 20 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _156MM_BENELLI_M1_SUPER_90_SA_20_GAUGE (151, "15.6mm Benelli M1 Super 90 SA 20 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Benelli M3 Super 90 SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_BENELLI_M3_SUPER_90_SA_12_GAUGE (152, "18.5mm Benelli M3 Super 90 SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 15.6mm Benelli M3 Super 90 SA 20 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _156MM_BENELLI_M3_SUPER_90_SA_20_GAUGE (153, "15.6mm Benelli M3 Super 90 SA 20 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Benelli M4 Super 90 SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_BENELLI_M4_SUPER_90_SA_12_GAUGE (154, "18.5mm Benelli M4 Super 90 SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Benelli Nova 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_BENELLI_NOVA_12_GAUGE (155, "18.5mm Benelli Nova 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 15.6mm Benelli Nove 20 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _156MM_BENELLI_NOVE_20_GAUGE (156, "15.6mm Benelli Nove 20 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Benelli Raffaello SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_BENELLI_RAFFAELLO_SA_12_GAUGE (157, "18.5mm Benelli Raffaello SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Benelli Supernova 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_BENELLI_SUPERNOVA_12_GAUGE (158, "18.5mm Benelli Supernova 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Benelli Vinci SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_BENELLI_VINCI_SA_12_GAUGE (159, "18.5mm Benelli Vinci SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Beretta 1201FP SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_BERETTA_1201FP_SA_12_GAUGE (160, "18.5mm Beretta 1201FP SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Beretta 682 O/U 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_BERETTA_682_O_U_12_GAUGE (161, "18.5mm Beretta 682 O/U 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 15.6mm Beretta 682 O/U 20 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _156MM_BERETTA_682_O_U_20_GAUGE (162, "15.6mm Beretta 682 O/U 20 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 14mm Beretta 682 O/U 28 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _14MM_BERETTA_682_O_U_28_GAUGE (163, "14mm Beretta 682 O/U 28 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 10.4mm Beretta 682 O/U .410 Bore */
-// autogenerated using string template disenumpart2.txt
-
     _104MM_BERETTA_682_O_U_410_BORE (164, "10.4mm Beretta 682 O/U .410 Bore"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Beretta A303 SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_BERETTA_A303_SA_12_GAUGE (165, "18.5mm Beretta A303 SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Beretta AL391 SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_BERETTA_AL391_SA_12_GAUGE (166, "18.5mm Beretta AL391 SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 15.6mm Beretta AL391 SA 20 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _156MM_BERETTA_AL391_SA_20_GAUGE (167, "15.6mm Beretta AL391 SA 20 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Beretta DT-10 O/U 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_BERETTA_DT_10_O_U_12_GAUGE (168, "18.5mm Beretta DT-10 O/U 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Beretta Silver Pigeon O/U */
-// autogenerated using string template disenumpart2.txt
-
     BERETTA_SILVER_PIGEON_O_U (169, "Beretta Silver Pigeon O/U"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Beretta Xtrema 2 SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_BERETTA_XTREMA_2_SA_12_GAUGE (170, "18.5mm Beretta Xtrema 2 SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 15.6mm Franchi AL-48 SA 20 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _156MM_FRANCHI_AL_48_SA_20_GAUGE (171, "15.6mm Franchi AL-48 SA 20 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 14mm Franchi AL-48 SA 28 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _14MM_FRANCHI_AL_48_SA_28_GAUGE (172, "14mm Franchi AL-48 SA 28 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 10.4mm Franchi mod .410 FA .410 Bore */
-// autogenerated using string template disenumpart2.txt
-
     _104MM_FRANCHI_MOD_410_FA_410_BORE (173, "10.4mm Franchi mod .410 FA .410 Bore"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Franchi SPAS-12 SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_FRANCHI_SPAS_12_SA_12_GAUGE (174, "18.5mm Franchi SPAS-12 SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Franchi SPAS-15 SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_FRANCHI_SPAS_15_SA_12_GAUGE (175, "18.5mm Franchi SPAS-15 SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Valtro PM-5/PM-5-350 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_VALTRO_PM_5_PM_5_350_12_GAUGE (176, "18.5mm Valtro PM-5/PM-5-350 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Blazer F3 O/U */
-// autogenerated using string template disenumpart2.txt
-
     BLAZER_F3_O_U (180, "Blazer F3 O/U"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm HK FABARM FP6 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_HK_FABARM_FP6_12_GAUGE (181, "18.5mm HK FABARM FP6 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm HK CAWS FA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_HK_CAWS_FA_12_GAUGE (182, "18.5mm HK CAWS FA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Baikal MP-153 SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_BAIKAL_MP_153_SA_12_GAUGE (200, "18.5mm Baikal MP-153 SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Bandayevsky RB-12 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_BANDAYEVSKY_RB_12_12_GAUGE (201, "18.5mm Bandayevsky RB-12 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Molot Bekas-M 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_MOLOT_BEKAS_M_12_GAUGE (202, "18.5mm Molot Bekas-M 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 16.8mm Molot Bekas-M 16 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _168MM_MOLOT_BEKAS_M_16_GAUGE (203, "16.8mm Molot Bekas-M 16 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm TOZ-194 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_TOZ_194_12_GAUGE (204, "18.5mm TOZ-194 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 23mm KS-23 */
-// autogenerated using string template disenumpart2.txt
-
     _23MM_KS_23 (205, "23mm KS-23"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** MTs-255 Revoler 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     MTS_255_REVOLER_12_GAUGE (206, "MTs-255 Revoler 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm RMB-93 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_RMB_93_12_GAUGE (207, "18.5mm RMB-93 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Saiga-12 SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_SAIGA_12_SA_12_GAUGE (208, "18.5mm Saiga-12 SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 15.6mm Saiga-12 SA 20 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _156MM_SAIGA_12_SA_20_GAUGE (209, "15.6mm Saiga-12 SA 20 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 10.4mm Saiga-12 SA .410 Bore */
-// autogenerated using string template disenumpart2.txt
-
     _104MM_SAIGA_12_SA_410_BORE (210, "10.4mm Saiga-12 SA .410 Bore"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Vepr-12 SA 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_VEPR_12_SA_12_GAUGE (211, "18.5mm Vepr-12 SA 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Fort 500 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
     _185MM_FORT_500_12_GAUGE (212, "18.5mm Fort 500 12 Gauge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18.5mm Norinco HP9-1 12 Gauge */
-// autogenerated using string template disenumpart2.txt
-
-    _185MM_NORINCO_HP9_1_12_GAUGE (220, "18.5mm Norinco HP9-1 12 Gauge"),;
-
-// autogenerated using string template disenumpart25.txt
+    _185MM_NORINCO_HP9_1_12_GAUGE (220, "18.5mm Norinco HP9-1 12 Gauge");
 
     private int value;
     private final String description;
@@ -902,8 +341,6 @@ public enum LifeFormHumanSpecificShotGuns
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSniper.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSniper.java
index 0762041c1d47b5f63e2eea47ea1f24e42ded6a94..ffe1bfb35e03915ad09288d1a9a890db2bb8aa6c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSniper.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSniper.java
@@ -7,180 +7,67 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 481,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 481 marshal size 8<br>
  * LifeFormHumanSpecificSniper
  */
 public enum LifeFormHumanSpecificSniper 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.8mm QBU-88 (Type 88) */
-// autogenerated using string template disenumpart2.txt
-
     _58MM_QBU_88_TYPE_88 (1, "5.8mm QBU-88 (Type 88)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm C3 */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "7.62mm C3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm FR F2 */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_FR_F2 (31, "7.62mm FR F2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm AWM-F (G22) */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_AWM_F_G22 (32, "7.62mm AWM-F (G22)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm G3 SG/1 */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_G3_SG_1 (33, "7.62mm G3 SG/1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm Galil Sniper */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_GALIL_SNIPER (34, "7.62mm Galil Sniper"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm L96A1 */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_L96A1 (35, "7.62mm L96A1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm M14 DMR */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_M14_DMR (36, "7.62mm M14 DMR"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm M24 Sniper Weapon System (SWS) */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_M24_SNIPER_WEAPON_SYSTEM_SWS (37, "7.62mm M24 Sniper Weapon System (SWS)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm M40A1/A3 */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_M40A1_A3 (38, "7.62mm M40A1/A3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm Steyr SSG 69 */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_STEYR_SSG_69 (39, "7.62mm Steyr SSG 69"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm SVD (Dragunov) */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_SVD_DRAGUNOV (40, "7.62mm SVD (Dragunov)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm TYPE 79 */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_TYPE_79 (41, "7.62mm TYPE 79"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm SR-25 MK11 */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_SR_25_MK11 (42, "7.62mm SR-25 MK11"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm AW SR-98 */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_AW_SR_98 (43, "7.62mm AW SR-98"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.62mm Blaser R93 */
-// autogenerated using string template disenumpart2.txt
-
     _762MM_BLASER_R93 (44, "7.62mm Blaser R93"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.7mm TYPE 99 */
-// autogenerated using string template disenumpart2.txt
-
     _77MM_TYPE_99 (100, "7.7mm TYPE 99"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 8.58mm Blaser R93 Tactical 2 */
-// autogenerated using string template disenumpart2.txt
-
     _858MM_BLASER_R93_TACTICAL_2 (105, "8.58mm Blaser R93 Tactical 2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9mm VSS Vintorez */
-// autogenerated using string template disenumpart2.txt
-
     _9MM_VSS_VINTOREZ (110, "9mm VSS Vintorez"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 12.7mm Steyr HS .50 */
-// autogenerated using string template disenumpart2.txt
-
     _127MM_STEYR_HS_50 (170, "12.7mm Steyr HS .50"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 12.7mm M82A1A Special Applications Scoped Rifle (SASR) */
-// autogenerated using string template disenumpart2.txt
-
     _127MM_M82A1A_SPECIAL_APPLICATIONS_SCOPED_RIFLE_SASR (171, "12.7mm M82A1A Special Applications Scoped Rifle (SASR)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 12.7mm NSV */
-// autogenerated using string template disenumpart2.txt
-
     _127MM_NSV (172, "12.7mm NSV"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 12.7mm OSV-96 */
-// autogenerated using string template disenumpart2.txt
-
     _127MM_OSV_96 (173, "12.7mm OSV-96"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 12.7mm Rangemaster 50 */
-// autogenerated using string template disenumpart2.txt
-
     _127MM_RANGEMASTER_50 (174, "12.7mm Rangemaster 50"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 12.7mm V94 */
-// autogenerated using string template disenumpart2.txt
-
     _127MM_V94 (175, "12.7mm V94"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 20mm Denel NTW-20 */
-// autogenerated using string template disenumpart2.txt
-
-    _20MM_DENEL_NTW_20 (200, "20mm Denel NTW-20"),;
-
-// autogenerated using string template disenumpart25.txt
+    _20MM_DENEL_NTW_20 (200, "20mm Denel NTW-20");
 
     private int value;
     private final String description;
@@ -230,8 +117,6 @@ public enum LifeFormHumanSpecificSniper
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSubMachineGun.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSubMachineGun.java
index 101fa9518bb948a167fbbf022cc312c77c8bf141..d4269ea5f14aa14efdd366050be616c64cce6de6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSubMachineGun.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSubMachineGun.java
@@ -7,96 +7,39 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 482,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 482 marshal size 8<br>
  * LifeFormHumanSpecificSubMachineGun
  */
 public enum LifeFormHumanSpecificSubMachineGun 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.45mm AKS-74U (AKSU-74) */
-// autogenerated using string template disenumpart2.txt
-
     _545MM_AKS_74U_AKSU_74 (10, "5.45mm AKS-74U (AKSU-74)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5.56mm Daewoo K1A */
-// autogenerated using string template disenumpart2.txt
-
     _556MM_DAEWOO_K1A (20, "5.56mm Daewoo K1A"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9mm Daewoo K7 */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "9mm Daewoo K7"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9mm MAC-10 */
-// autogenerated using string template disenumpart2.txt
-
     EVENT_REPORT_RELIABLE (61, "9mm MAC-10"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9mm Madsen MK II */
-// autogenerated using string template disenumpart2.txt
-
     COMMENT_RELIABLE (62, "9mm Madsen MK II"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9mm Mini-Uzi */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_RELIABLE (63, "9mm Mini-Uzi"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9mm Model 83 Skorpion SMG */
-// autogenerated using string template disenumpart2.txt
-
     SET_RECORD_RELIABLE	 (64, "9mm Model 83 Skorpion SMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9mm MP5A2 */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_QUERY_RELIABLE (65, "9mm MP5A2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9mm MP5-N */
-// autogenerated using string template disenumpart2.txt
-
     _9MM_MP5_N (66, "9mm MP5-N"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9mm Sterling SMG */
-// autogenerated using string template disenumpart2.txt
-
     _9MM_STERLING_SMG (67, "9mm Sterling SMG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9mm Type CF-05 */
-// autogenerated using string template disenumpart2.txt
-
     _9MM_TYPE_CF_05 (68, "9mm Type CF-05"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9mm Uzi */
-// autogenerated using string template disenumpart2.txt
-
-    _9MM_UZI (69, "9mm Uzi"),;
-
-// autogenerated using string template disenumpart25.txt
+    _9MM_UZI (69, "9mm Uzi");
 
     private int value;
     private final String description;
@@ -146,8 +89,6 @@ public enum LifeFormHumanSpecificSubMachineGun
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificWeaponNonspecific.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificWeaponNonspecific.java
index 407e7cc67d5ff83c579b3ed2b949db56cbcc5570..dc1fe333fe05e8dfd727833d1cd730b927b1d9c1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificWeaponNonspecific.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificWeaponNonspecific.java
@@ -7,48 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 514,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 514 marshal size 8<br>
  * LifeFormHumanSpecificWeaponNonspecific
  */
 public enum LifeFormHumanSpecificWeaponNonspecific 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Knife */
-// autogenerated using string template disenumpart2.txt
-
     KNIFE (10, "Knife"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Machete */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "Machete"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Explosive Vest */
-// autogenerated using string template disenumpart2.txt
-
     EXPLOSIVE_VEST (100, "Explosive Vest"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M18A1 Claymore */
-// autogenerated using string template disenumpart2.txt
-
-    M18A1_CLAYMORE (150, "M18A1 Claymore"),;
-
-// autogenerated using string template disenumpart25.txt
+    M18A1_CLAYMORE (150, "M18A1 Claymore");
 
     private int value;
     private final String description;
@@ -98,8 +73,6 @@ public enum LifeFormHumanSpecificWeaponNonspecific
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSubcategoryEquipmentClass.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSubcategoryEquipmentClass.java
index 2e12171a2a8f0dc3a5e7b677ca8bafe962dc4619..b5ed83897cc5d32075866deda1f1ff0cb5e8593d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSubcategoryEquipmentClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSubcategoryEquipmentClass.java
@@ -7,169 +7,48 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 473,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 473 marshal size 8<br>
  * LifeFormHumanSubcategoryEquipmentClass
  */
 public enum LifeFormHumanSubcategoryEquipmentClass 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** None */
-// autogenerated using string template disenumpart2.txt
-
     NONE (0, "None"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeFormHumanSpecificWeaponNonspecific */// autogenerated using string template disenumpart21.txt
-
-    WEAPON_NON_SPECIFIC_2 (1, "Weapon, Non-specific"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeFormHumanSpecificAssaultRifles */// autogenerated using string template disenumpart21.txt
-
-    ASSAULT_RIFLES_2 (5, "Assault Rifles"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeFormHumanSpecificHighPowerRifles */// autogenerated using string template disenumpart21.txt
-
-    HIGH_POWER_RIFLES_2 (10, "High Power Rifles"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeFormHumanSpecificSniper */// autogenerated using string template disenumpart21.txt
-
-    SNIPER_RIFLES_2 (15, "Sniper Rifles"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeFormHumanSpecificAntiMaterielRifles */// autogenerated using string template disenumpart21.txt
-
-    ANTI_MATERIEL_RIFLE_AMR_2 (17, "Anti-Materiel Rifle (AMR)"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeFormHumanSpecificSubMachineGun */// autogenerated using string template disenumpart21.txt
-
-    SUB_MACHINE_GUNS_2 (20, "Sub Machine Guns"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeFormHumanSpecificShotGuns */// autogenerated using string template disenumpart21.txt
-
-    SHOT_GUNS_2 (25, "Shot Guns"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeFormHumanSpecificGrenadeLaunchers */// autogenerated using string template disenumpart21.txt
-
-    GRENADE_LAUNCHERS (30, "Grenade Launchers"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeFormHumanSpecificMachineGuns */// autogenerated using string template disenumpart21.txt
-
-    MACHINE_GUNS_2 (35, "Machine Guns"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeFormHumanSpecificGrenadeLaunchingMachineGun */// autogenerated using string template disenumpart21.txt
-
-    GRENADE_LAUNCHING_MACHINE_GUN_2 (40, "Grenade Launching Machine Gun"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeFormHumanSpecificAntiTankRockets */// autogenerated using string template disenumpart21.txt
-
-    ANTI_TANK_ROCKETS_2 (45, "Anti-Tank Rockets"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeFormHumanSpecificAntiTankMissiles */// autogenerated using string template disenumpart21.txt
-
-    ANTI_TANK_MISSILES (50, "Anti-Tank Missiles"),
-// autogenerated using string template disenumfootnotecomment.txt
-
+    /** LifeFormHumanSpecificWeaponNonspecific */    WEAPON_NON_SPECIFIC_2 (1, "Weapon, Non-specific"),
+    /** LifeFormHumanSpecificAssaultRifles */    ASSAULT_RIFLES_2 (5, "Assault Rifles"),
+    /** LifeFormHumanSpecificHighPowerRifles */    HIGH_POWER_RIFLES_2 (10, "High Power Rifles"),
+    /** LifeFormHumanSpecificSniper */    SNIPER_RIFLES_2 (15, "Sniper Rifles"),
+    /** LifeFormHumanSpecificAntiMaterielRifles */    ANTI_MATERIEL_RIFLE_AMR_2 (17, "Anti-Materiel Rifle (AMR)"),
+    /** LifeFormHumanSpecificSubMachineGun */    SUB_MACHINE_GUNS_2 (20, "Sub Machine Guns"),
+    /** LifeFormHumanSpecificShotGuns */    SHOT_GUNS_2 (25, "Shot Guns"),
+    /** LifeFormHumanSpecificGrenadeLaunchers */    GRENADE_LAUNCHERS (30, "Grenade Launchers"),
+    /** LifeFormHumanSpecificMachineGuns */    MACHINE_GUNS_2 (35, "Machine Guns"),
+    /** LifeFormHumanSpecificGrenadeLaunchingMachineGun */    GRENADE_LAUNCHING_MACHINE_GUN_2 (40, "Grenade Launching Machine Gun"),
+    /** LifeFormHumanSpecificAntiTankRockets */    ANTI_TANK_ROCKETS_2 (45, "Anti-Tank Rockets"),
+    /** LifeFormHumanSpecificAntiTankMissiles */    ANTI_TANK_MISSILES (50, "Anti-Tank Missiles"),
     /** Anti-Tank Guns */
-// autogenerated using string template disenumpart2.txt
-
     ACKNOWLEDGE_RELIABLE (55, "Anti-Tank Guns"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeFormHumanSpecificFlameRockets */// autogenerated using string template disenumpart21.txt
-
-    FLAME_ROCKETS (60, "Flame Rockets"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeFormHumanSpecificFlameThrowers */// autogenerated using string template disenumpart21.txt
-
-    FLAME_THROWERS (65, "Flame Throwers"),
-// autogenerated using string template disenumfootnotecomment.txt
-
+    /** LifeFormHumanSpecificFlameRockets */    FLAME_ROCKETS (60, "Flame Rockets"),
+    /** LifeFormHumanSpecificFlameThrowers */    FLAME_THROWERS (65, "Flame Throwers"),
     /** Rocket Launchers */
-// autogenerated using string template disenumpart2.txt
-
     ROCKET_LAUNCHERS (70, "Rocket Launchers"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeFormHumanSpecificMortars */// autogenerated using string template disenumpart21.txt
-
-    MORTARS_2 (75, "Mortars"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeFormHumanSpecificHandGuns */// autogenerated using string template disenumpart21.txt
-
-    HAND_GUNS_2 (80, "Hand Guns"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeFormHumanSpecificManPortableAirDefenseSystem */// autogenerated using string template disenumpart21.txt
-
-    MAN_PORTABLE_AIR_DEFENSE_SYSTEM_MANPADS_2 (85, "Man-Portable Air Defense System (MANPADS)"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeFormHumanSpecificRecoillessRifles */// autogenerated using string template disenumpart21.txt
-
-    RECOILLESS_RIFLES_2 (90, "Recoilless Rifles"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeFormHumanSpecificDroneGuns */// autogenerated using string template disenumpart21.txt
-
-    DRONE_GUNS_2 (95, "Drone Guns"),
-// autogenerated using string template disenumfootnotecomment.txt
-
+    /** LifeFormHumanSpecificMortars */    MORTARS_2 (75, "Mortars"),
+    /** LifeFormHumanSpecificHandGuns */    HAND_GUNS_2 (80, "Hand Guns"),
+    /** LifeFormHumanSpecificManPortableAirDefenseSystem */    MAN_PORTABLE_AIR_DEFENSE_SYSTEM_MANPADS_2 (85, "Man-Portable Air Defense System (MANPADS)"),
+    /** LifeFormHumanSpecificRecoillessRifles */    RECOILLESS_RIFLES_2 (90, "Recoilless Rifles"),
+    /** LifeFormHumanSpecificDroneGuns */    DRONE_GUNS_2 (95, "Drone Guns"),
     /** Equipment, Non-specific, Subcategories 150-199 are restricted to non-weapon equipment classes. */
-// autogenerated using string template disenumpart2.txt
-
     EQUIPMENT_NON_SPECIFIC (150, "Equipment, Non-specific"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sensors, Subcategories 151-159 are restricted to sensor equipment classes. */
-// autogenerated using string template disenumpart2.txt
-
     SENSORS (151, "Sensors"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeFormHumanSpecificEquipmentClass */// autogenerated using string template disenumpart21.txt
-
-    SIGNAL_SENSOR_2 (152, "Signal Sensor"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeFormHumanSpecificLasersClass */// autogenerated using string template disenumpart21.txt
-
-    LASERS_2 (153, "Lasers"),
-// autogenerated using string template disenumfootnotecomment.txt
-
+    /** LifeFormHumanSpecificEquipmentClass */    SIGNAL_SENSOR_2 (152, "Signal Sensor"),
+    /** LifeFormHumanSpecificLasersClass */    LASERS_2 (153, "Lasers"),
     /** Animal Companion, Subcategories 160-169 are restricted to animal companion classes. */
-// autogenerated using string template disenumpart2.txt
-
     ANIMAL_COMPANION (160, "Animal Companion"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeFormHumanSpecificPersonalElectronicsClass */// autogenerated using string template disenumpart21.txt
-
-    PERSONAL_ELECTRONICS_2 (171, "Personal Electronics"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeFormHumanSpecificLogisticsEQClass */// autogenerated using string template disenumpart21.txt
-
-    LOGISTICS_EQUIPMENT_2 (172, "Logistics Equipment"),;
-
-// autogenerated using string template disenumpart25.txt
+    /** LifeFormHumanSpecificPersonalElectronicsClass */    PERSONAL_ELECTRONICS_2 (171, "Personal Electronics"),
+    /** LifeFormHumanSpecificLogisticsEQClass */    LOGISTICS_EQUIPMENT_2 (172, "Logistics Equipment");
 
     private int value;
     private final String description;
@@ -219,8 +98,6 @@ public enum LifeFormHumanSubcategoryEquipmentClass
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormLandCategories.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormLandCategories.java
index 8162f9f2c97068ea87bdea393d9eac4049f4281b..42f4216a44c0f286a879895d0635c1411a2ab8e5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormLandCategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormLandCategories.java
@@ -7,173 +7,60 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 472,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 472 marshal size 8<br>
  * LifeFormLandCategories
  */
 public enum LifeFormLandCategories implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Conventional Armed Forces, Values from 10-29 are restricted to Conventional Armed Forces and may be further clarified by country code-specific values. */
-// autogenerated using string template disenumpart2.txt
-
     CONVENTIONAL_ARMED_FORCES (10, "Conventional Armed Forces"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Army */
-// autogenerated using string template disenumpart2.txt
-
     ARMY (11, "Army"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Naval Infantry (Marines) */
-// autogenerated using string template disenumpart2.txt
-
     NAVAL_INFANTRY_MARINES (12, "Naval Infantry (Marines)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Air Force */
-// autogenerated using string template disenumpart2.txt
-
     AIR_FORCE (13, "Air Force"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Navy */
-// autogenerated using string template disenumpart2.txt
-
     NAVY (14, "Navy"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Coast Guard */
-// autogenerated using string template disenumpart2.txt
-
     COAST_GUARD (15, "Coast Guard"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** United Nations */
-// autogenerated using string template disenumpart2.txt
-
     UNITED_NATIONS (16, "United Nations"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Special Operations Forces (SOF), Values from 30-49 are restricted to Special Operations Forces and may be further clarified by country code-specific values. */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Special Operations Forces (SOF)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Law Enforcement, Values from 50-69 are restricted to Law Enforcement and may be further clarified by country code-specific values. */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "Law Enforcement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Non-Military National Government Agencies, Values from 70-89 are restricted to Non-Military National Government Agencies and may be further clarified by country code-specific values. */
-// autogenerated using string template disenumpart2.txt
-
     NON_MILITARY_NATIONAL_GOVERNMENT_AGENCIES (70, "Non-Military National Government Agencies"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Regional / Local Forces, Values from 90-99 are restricted to Regional / Local Forces (e.g., state guard) and may be further clarified by country code-specific values. */
-// autogenerated using string template disenumpart2.txt
-
     REGIONAL_LOCAL_FORCES (90, "Regional / Local Forces"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Irregular Forces, Values from 100-109 are restricted to Irregular Forces and may be further clarified by country code-specific values. */
-// autogenerated using string template disenumpart2.txt
-
     IRREGULAR_FORCES (100, "Irregular Forces"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Terrorist Combatant */
-// autogenerated using string template disenumpart2.txt
-
     TERRORIST_COMBATANT (101, "Terrorist Combatant"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Insurgent */
-// autogenerated using string template disenumpart2.txt
-
     INSURGENT (102, "Insurgent"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Paramilitary Forces, Values from 110-119 are restricted to Paramilitary Forces and may be further clarified by country code-specific values. */
-// autogenerated using string template disenumpart2.txt
-
     PARAMILITARY_FORCES (110, "Paramilitary Forces"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Humanitarian Organizations, Values from 120-129 are restricted to non-governmental Humanitarian Organizations and may be further clarified by country code-specific values. */
-// autogenerated using string template disenumpart2.txt
-
     HUMANITARIAN_ORGANIZATIONS (120, "Humanitarian Organizations"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Civilian, Values from 130-159 are restricted to Civilians and may be further clarified by country code-specific values. */
-// autogenerated using string template disenumpart2.txt
-
     CIVILIAN (130, "Civilian"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Emergency Medical Technician (EMT) */
-// autogenerated using string template disenumpart2.txt
-
     EMERGENCY_MEDICAL_TECHNICIAN_EMT (131, "Emergency Medical Technician (EMT)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Firefighter */
-// autogenerated using string template disenumpart2.txt
-
     FIREFIGHTER (132, "Firefighter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Press */
-// autogenerated using string template disenumpart2.txt
-
     PRESS (133, "Press"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** SubcategoriesforLandCategory200Mammal */// autogenerated using string template disenumpart21.txt
-
-    MAMMAL_2 (200, "Mammal"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** SubcategoriesforLandCategory201Reptile */// autogenerated using string template disenumpart21.txt
-
-    REPTILE_2 (201, "Reptile"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** SubcategoriesforLandCategory202Amphibian */// autogenerated using string template disenumpart21.txt
-
-    AMPHIBIAN_2 (202, "Amphibian"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** SubcategoriesforLandCategory203Insect */// autogenerated using string template disenumpart21.txt
-
-    INSECT_2 (203, "Insect"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** SubcategoriesforLandCategory204Arachnid */// autogenerated using string template disenumpart21.txt
-
-    ARACHNID_2 (204, "Arachnid"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** SubcategoriesforLandCategory205Mollusk */// autogenerated using string template disenumpart21.txt
-
-    MOLLUSK_2 (205, "Mollusk"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** SubcategoriesforLandCategory206Marsupial */// autogenerated using string template disenumpart21.txt
-
-    MARSUPIAL_2 (206, "Marsupial"),;
-
-// autogenerated using string template disenumpart25.txt
+    /** SubcategoriesforLandCategory200Mammal */    MAMMAL_2 (200, "Mammal"),
+    /** SubcategoriesforLandCategory201Reptile */    REPTILE_2 (201, "Reptile"),
+    /** SubcategoriesforLandCategory202Amphibian */    AMPHIBIAN_2 (202, "Amphibian"),
+    /** SubcategoriesforLandCategory203Insect */    INSECT_2 (203, "Insect"),
+    /** SubcategoriesforLandCategory204Arachnid */    ARACHNID_2 (204, "Arachnid"),
+    /** SubcategoriesforLandCategory205Mollusk */    MOLLUSK_2 (205, "Mollusk"),
+    /** SubcategoriesforLandCategory206Marsupial */    MARSUPIAL_2 (206, "Marsupial");
 
     private int value;
     private final String description;
@@ -223,8 +110,6 @@ public enum LifeFormLandCategories implements Category
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormSubsurfaceCategories.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormSubsurfaceCategories.java
index 3a25972a0e82fd60eab4af4942dc1ec314baaad4..c88a789d79d7a3ad0d1c20b40c344a71cc38550f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormSubsurfaceCategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormSubsurfaceCategories.java
@@ -7,43 +7,18 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 479,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 479 marshal size 8<br>
  * LifeFormSubsurfaceCategories
  */
 public enum LifeFormSubsurfaceCategories 
 {
-// autogenerated using string template disdictenumcomment.txt
-
-    /** SubcategoriesforSubsurfaceCategory200Fish */// autogenerated using string template disenumpart21.txt
-
-    FISH_2 (200, "Fish"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** SubcategoriesforSubsurfaceCategory201Mammal */// autogenerated using string template disenumpart21.txt
-
-    MAMMAL_2 (201, "Mammal"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** SubcategoriesforSubsurfaceCategory202Mollusk */// autogenerated using string template disenumpart21.txt
-
-    MOLLUSK_2 (202, "Mollusk"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** SubcategoriesforSubsurfaceCategory203Crustacean */// autogenerated using string template disenumpart21.txt
-
-    CRUSTACEAN_2 (203, "Crustacean"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** SubcategoriesforSubsurfaceCategory204Insect */// autogenerated using string template disenumpart21.txt
-
-    INSECT_2 (204, "Insect"),;
-
-// autogenerated using string template disenumpart25.txt
+    /** SubcategoriesforSubsurfaceCategory200Fish */    FISH_2 (200, "Fish"),
+    /** SubcategoriesforSubsurfaceCategory201Mammal */    MAMMAL_2 (201, "Mammal"),
+    /** SubcategoriesforSubsurfaceCategory202Mollusk */    MOLLUSK_2 (202, "Mollusk"),
+    /** SubcategoriesforSubsurfaceCategory203Crustacean */    CRUSTACEAN_2 (203, "Crustacean"),
+    /** SubcategoriesforSubsurfaceCategory204Insect */    INSECT_2 (204, "Insect");
 
     private int value;
     private final String description;
@@ -93,8 +68,6 @@ public enum LifeFormSubsurfaceCategories
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryCISWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryCISWeapons.java
index c5b0748267e6d4459f8f60d68767d034732256df..244ca150ba2124602b6f105d808f7fa555147819 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryCISWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryCISWeapons.java
@@ -7,330 +7,117 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 17,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 17 marshal size 8<br>
  * LifeFormsSubcategoryCISWeapons
  */
 public enum LifeFormsSubcategoryCISWeapons implements SubCategory
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Automatic (APS) 9-mm, Stechkin */
-// autogenerated using string template disenumpart2.txt
-
     AUTOMATIC_APS_9_MM_STECHKIN (201, "Automatic (APS) 9-mm, Stechkin"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** PSM 5.45-mm */
-// autogenerated using string template disenumpart2.txt
-
     PSM_545_MM (202, "PSM 5.45-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Self-loading (PM) 9-mm, Makarov */
-// autogenerated using string template disenumpart2.txt
-
     SELF_LOADING_PM_9_MM_MAKAROV (203, "Self-loading (PM) 9-mm, Makarov"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** TT-33 7.62-mm, Tokarev */
-// autogenerated using string template disenumpart2.txt
-
     TT_33_762_MM_TOKAREV (204, "TT-33 7.62-mm, Tokarev"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Assault rifle AK and AKM, 7.62-mm */
-// autogenerated using string template disenumpart2.txt
-
     ASSAULT_RIFLE_AK_AND_AKM_762_MM (205, "Assault rifle AK and AKM, 7.62-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Assault rifle AK-74 and AKS-74, 5.45-mm */
-// autogenerated using string template disenumpart2.txt
-
     ASSAULT_RIFLE_AK_74_AND_AKS_74_545_MM (206, "Assault rifle AK-74 and AKS-74, 5.45-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Self-loading rifle (SKS), 7.62-mm, Simonov */
-// autogenerated using string template disenumpart2.txt
-
     SELF_LOADING_RIFLE_SKS_762_MM_SIMONOV (207, "Self-loading rifle (SKS), 7.62-mm, Simonov"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sniper rifle SVD 7.62-mm, Dragunov */
-// autogenerated using string template disenumpart2.txt
-
     SNIPER_RIFLE_SVD_762_MM_DRAGUNOV (208, "Sniper rifle SVD 7.62-mm, Dragunov"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** AKSU-74 5.45-mm */
-// autogenerated using string template disenumpart2.txt
-
     AKSU_74_545_MM (209, "AKSU-74 5.45-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** PPS-43 7.62-mm */
-// autogenerated using string template disenumpart2.txt
-
     PPS_43_762_MM (210, "PPS-43 7.62-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** PPSh-41 7.62-mm */
-// autogenerated using string template disenumpart2.txt
-
     PPSH_41_762_MM (211, "PPSh-41 7.62-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** General purpose PK 7.62-mm */
-// autogenerated using string template disenumpart2.txt
-
     GENERAL_PURPOSE_PK_762_MM (212, "General purpose PK 7.62-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Heavy DShK-38 and Model 38/46 12.7-mm, Degtyarev */
-// autogenerated using string template disenumpart2.txt
-
     HEAVY_DSHK_38_AND_MODEL_38_46_127_MM_DEGTYAREV (213, "Heavy DShK-38 and Model 38/46 12.7-mm, Degtyarev"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Heavy NSV 12.7-mm */
-// autogenerated using string template disenumpart2.txt
-
     HEAVY_NSV_127_MM (214, "Heavy NSV 12.7-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light RPD 7.62-mm */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT_RPD_762_MM (215, "Light RPD 7.62-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light RPK 7.62-mm */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT_RPK_762_MM (216, "Light RPK 7.62-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light RPK-74 5.45-mm */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT_RPK_74_545_MM (217, "Light RPK-74 5.45-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hand grenade M75 */
-// autogenerated using string template disenumpart2.txt
-
     HAND_GRENADE_M75 (218, "Hand grenade M75"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hand grenade RGD-5 */
-// autogenerated using string template disenumpart2.txt
-
     HAND_GRENADE_RGD_5 (219, "Hand grenade RGD-5"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** AP hand grenade F1 */
-// autogenerated using string template disenumpart2.txt
-
     AP_HAND_GRENADE_F1 (220, "AP hand grenade F1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** AT hand grenade RKG-3 */
-// autogenerated using string template disenumpart2.txt
-
     AT_HAND_GRENADE_RKG_3 (221, "AT hand grenade RKG-3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** AT hand grenade RKG-3M */
-// autogenerated using string template disenumpart2.txt
-
     AT_HAND_GRENADE_RKG_3M (222, "AT hand grenade RKG-3M"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** AT hand grenade RKG-3T */
-// autogenerated using string template disenumpart2.txt
-
     AT_HAND_GRENADE_RKG_3T (223, "AT hand grenade RKG-3T"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fragmentation hand grenade RGN */
-// autogenerated using string template disenumpart2.txt
-
     FRAGMENTATION_HAND_GRENADE_RGN (224, "Fragmentation hand grenade RGN"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fragmentation hand grenade RGO */
-// autogenerated using string template disenumpart2.txt
-
     FRAGMENTATION_HAND_GRENADE_RGO (225, "Fragmentation hand grenade RGO"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Smoke hand grenade RDG-1 */
-// autogenerated using string template disenumpart2.txt
-
     SMOKE_HAND_GRENADE_RDG_1 (226, "Smoke hand grenade RDG-1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Plamya launcher, 30-mm AGS-17 */
-// autogenerated using string template disenumpart2.txt
-
     PLAMYA_LAUNCHER_30_MM_AGS_17 (227, "Plamya launcher, 30-mm AGS-17"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Rifle-mounted launcher, BG-15 40-mm */
-// autogenerated using string template disenumpart2.txt
-
     RIFLE_MOUNTED_LAUNCHER_BG_15_40_MM (228, "Rifle-mounted launcher, BG-15 40-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** LPO-50 */
-// autogenerated using string template disenumpart2.txt
-
     LPO_50 (229, "LPO-50"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** ROKS-3 */
-// autogenerated using string template disenumpart2.txt
-
     ROKS_3 (230, "ROKS-3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cart-mounted TPO-50 */
-// autogenerated using string template disenumpart2.txt
-
     CART_MOUNTED_TPO_50 (231, "Cart-mounted TPO-50"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Gimlet SA-16 */
-// autogenerated using string template disenumpart2.txt
-
     GIMLET_SA_16 (232, "Gimlet SA-16"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Grail SA-7 */
-// autogenerated using string template disenumpart2.txt
-
     GRAIL_SA_7 (233, "Grail SA-7"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Gremlin SA-14 */
-// autogenerated using string template disenumpart2.txt
-
     GREMLIN_SA_14 (234, "Gremlin SA-14"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sagger AT-3 (MCLOS) */
-// autogenerated using string template disenumpart2.txt
-
     SAGGER_AT_3_MCLOS (235, "Sagger AT-3 (MCLOS)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Saxhorn AT-7 */
-// autogenerated using string template disenumpart2.txt
-
     SAXHORN_AT_7 (236, "Saxhorn AT-7"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Spigot A/B AT-14 */
-// autogenerated using string template disenumpart2.txt
-
     SPIGOT_A_B_AT_14 (237, "Spigot A/B AT-14"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SA-18 */
-// autogenerated using string template disenumpart2.txt
-
     SA_18 (238, "SA-18"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SA-19 */
-// autogenerated using string template disenumpart2.txt
-
     SA_19 (239, "SA-19"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Grad-1P manportable tripod rocket launcher, 122-mm (for Spesnatz and other specialists; aka 9P132) */
-// autogenerated using string template disenumpart2.txt
-
     GRAD_1P_MANPORTABLE_TRIPOD_ROCKET_LAUNCHER_122_MM_FOR_SPESNATZ_AND_OTHER_SPECIALISTS_AKA_9P132 (240, "Grad-1P manportable tripod rocket launcher, 122-mm (for Spesnatz and other specialists; aka 9P132)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light Anti-Armor weapon RPG-18 */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT_ANTI_ARMOR_WEAPON_RPG_18 (241, "Light Anti-Armor weapon RPG-18"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light Anti-Tank weapon RPG-22 */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT_ANTI_TANK_WEAPON_RPG_22 (242, "Light Anti-Tank weapon RPG-22"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** MG and RPG */
-// autogenerated using string template disenumpart2.txt
-
     MG_RPG (243, "MG & RPG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Portable rocket launcher RPG-16 */
-// autogenerated using string template disenumpart2.txt
-
     PORTABLE_ROCKET_LAUNCHER_RPG_16 (244, "Portable rocket launcher RPG-16"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Recoilless gun 73-mm SPG-9 */
-// autogenerated using string template disenumpart2.txt
-
     RECOILLESS_GUN_73_MM_SPG_9 (245, "Recoilless gun 73-mm SPG-9"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** VAT rocket launcher RPG-7 */
-// autogenerated using string template disenumpart2.txt
-
     VAT_ROCKET_LAUNCHER_RPG_7 (246, "VAT rocket launcher RPG-7"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mon-50 Anti-Personnel mine */
-// autogenerated using string template disenumpart2.txt
-
     MON_50_ANTI_PERSONNEL_MINE (248, "Mon-50 Anti-Personnel mine"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** RPG-29 Vampir */
-// autogenerated using string template disenumpart2.txt
-
     RPG_29_VAMPIR (249, "RPG-29 Vampir"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Laser Designator */
-// autogenerated using string template disenumpart2.txt
-
     LASER_DESIGNATOR (250, "Laser Designator"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** AT-4 Spigot */
-// autogenerated using string template disenumpart2.txt
-
     AT_4_SPIGOT (251, "AT-4 Spigot"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SA-24 Igla-S */
-// autogenerated using string template disenumpart2.txt
-
     SA_24_IGLA_S (252, "SA-24 Igla-S"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Type 69 RPG */
-// autogenerated using string template disenumpart2.txt
-
-    TYPE_69_RPG (253, "Type 69 RPG"),;
-
-// autogenerated using string template disenumpart25.txt
+    TYPE_69_RPG (253, "Type 69 RPG");
 
     private int value;
     private final String description;
@@ -380,8 +167,6 @@ public enum LifeFormsSubcategoryCISWeapons implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryFrenchWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryFrenchWeapons.java
index aa3307e7a7c8ca4de8679cec4d0fc9f9de56e315..8a3c1563b3304027c0d0dc27b583e18449677d65 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryFrenchWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryFrenchWeapons.java
@@ -7,66 +7,29 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 19,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 19 marshal size 8<br>
  * LifeFormsSubcategoryFrenchWeapons
  */
 public enum LifeFormsSubcategoryFrenchWeapons implements SubCategory
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** ACL-STRIM */
-// autogenerated using string template disenumpart2.txt
-
     ACL_STRIM (1, "ACL-STRIM"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mistral missile */
-// autogenerated using string template disenumpart2.txt
-
     MISTRAL_MISSILE (2, "Mistral missile"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Milan AT missile */
-// autogenerated using string template disenumpart2.txt
-
     MILAN_AT_MISSILE (3, "Milan AT missile"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** LRAC F1 89-mm AT rocket launcher */
-// autogenerated using string template disenumpart2.txt
-
     LRAC_F1_89_MM_AT_ROCKET_LAUNCHER (4, "LRAC F1 89-mm AT rocket launcher"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** FA-MAS rifle */
-// autogenerated using string template disenumpart2.txt
-
     FA_MAS_RIFLE (5, "FA-MAS rifle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** AA-52 machine gun */
-// autogenerated using string template disenumpart2.txt
-
     AA_52_MACHINE_GUN (6, "AA-52 machine gun"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 58-mm rifle grenade */
-// autogenerated using string template disenumpart2.txt
-
     _58_MM_RIFLE_GRENADE (7, "58-mm rifle grenade"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** FR-F1 sniper rifle */
-// autogenerated using string template disenumpart2.txt
-
-    FR_F1_SNIPER_RIFLE (8, "FR-F1 sniper rifle"),;
-
-// autogenerated using string template disenumpart25.txt
+    FR_F1_SNIPER_RIFLE (8, "FR-F1 sniper rifle");
 
     private int value;
     private final String description;
@@ -116,8 +79,6 @@ public enum LifeFormsSubcategoryFrenchWeapons implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryGermanWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryGermanWeapons.java
index 5ddbe0f4f233ed69afb50fec05abaff300027702..0bcdb405ddaa2a70c1c01b0cbf8aaab9fdab3603 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryGermanWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryGermanWeapons.java
@@ -7,72 +7,31 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 20,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 20 marshal size 8<br>
  * LifeFormsSubcategoryGermanWeapons
  */
 public enum LifeFormsSubcategoryGermanWeapons implements SubCategory
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** G3 rifle */
-// autogenerated using string template disenumpart2.txt
-
     G3_RIFLE (1, "G3 rifle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** G11 rifle */
-// autogenerated using string template disenumpart2.txt
-
     G11_RIFLE (2, "G11 rifle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** P1 pistol */
-// autogenerated using string template disenumpart2.txt
-
     P1_PISTOL (3, "P1 pistol"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** MG3 machine gun */
-// autogenerated using string template disenumpart2.txt
-
     MG3_MACHINE_GUN (4, "MG3 machine gun"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Milan missile */
-// autogenerated using string template disenumpart2.txt
-
     MILAN_MISSILE (5, "Milan missile"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** MP1 Uzi submachine gun */
-// autogenerated using string template disenumpart2.txt
-
     MP1_UZI_SUBMACHINE_GUN (6, "MP1 Uzi submachine gun"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Panzerfaust 3 Light Anti-Tank Weapon */
-// autogenerated using string template disenumpart2.txt
-
     PANZERFAUST_3_LIGHT_ANTI_TANK_WEAPON (7, "Panzerfaust 3 Light Anti-Tank Weapon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** DM19 hand grenade */
-// autogenerated using string template disenumpart2.txt
-
     DM19_HAND_GRENADE (8, "DM19 hand grenade"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** DM29 hand grenade */
-// autogenerated using string template disenumpart2.txt
-
-    DM29_HAND_GRENADE (9, "DM29 hand grenade"),;
-
-// autogenerated using string template disenumpart25.txt
+    DM29_HAND_GRENADE (9, "DM29 hand grenade");
 
     private int value;
     private final String description;
@@ -122,8 +81,6 @@ public enum LifeFormsSubcategoryGermanWeapons implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryIranianWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryIranianWeapons.java
index 549f12b1d5dbdbeb94cfad5a9e11cc8125ef4c80..8ebf4bacfe9ed7be0c5fd54cfb567d684df1aeb2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryIranianWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryIranianWeapons.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 471,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 471 marshal size 8<br>
  * LifeFormsSubcategoryIranianWeapons
  */
 public enum LifeFormsSubcategoryIranianWeapons implements SubCategory
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Misagh-2 */
-// autogenerated using string template disenumpart2.txt
-
     MISAGH_2 (1, "Misagh-2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** RBS-70 */
-// autogenerated using string template disenumpart2.txt
-
-    RBS_70 (2, "RBS-70"),;
-
-// autogenerated using string template disenumpart25.txt
+    RBS_70 (2, "RBS-70");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum LifeFormsSubcategoryIranianWeapons implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUKWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUKWeapons.java
index bd13db9563b22b8ddbaef98e8e78078e149982b1..93846930207473b1efec8c78898c44a61c75e670 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUKWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUKWeapons.java
@@ -7,90 +7,37 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 18,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 18 marshal size 8<br>
  * LifeFormsSubcategoryUKWeapons
  */
 public enum LifeFormsSubcategoryUKWeapons implements SubCategory
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** LAW 80 */
-// autogenerated using string template disenumpart2.txt
-
     LAW_80 (1, "LAW 80"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Blowpipe */
-// autogenerated using string template disenumpart2.txt
-
     BLOWPIPE (2, "Blowpipe"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Javelin */
-// autogenerated using string template disenumpart2.txt
-
     JAVELIN (3, "Javelin"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 51-mm mortar */
-// autogenerated using string template disenumpart2.txt
-
     _51_MM_MORTAR (4, "51-mm mortar"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SLR 7.62-mm rifle */
-// autogenerated using string template disenumpart2.txt
-
     SLR_762_MM_RIFLE (5, "SLR 7.62-mm rifle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sterling 9-mm submachine gun */
-// autogenerated using string template disenumpart2.txt
-
     STERLING_9_MM_SUBMACHINE_GUN (6, "Sterling 9-mm submachine gun"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** L7A2 general purpose MG */
-// autogenerated using string template disenumpart2.txt
-
     L7A2_GENERAL_PURPOSE_MG (7, "L7A2 general purpose MG"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** L6 Wombat Recoilless rifle, */
-// autogenerated using string template disenumpart2.txt
-
     L6_WOMBAT_RECOILLESS_RIFLE_ (8, "L6 Wombat Recoilless rifle,"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Carl Gustav 89-mm recoilless rifle */
-// autogenerated using string template disenumpart2.txt
-
     CARL_GUSTAV_89_MM_RECOILLESS_RIFLE (9, "Carl Gustav 89-mm recoilless rifle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SA80 Individual/light support weapon */
-// autogenerated using string template disenumpart2.txt
-
     SA80_INDIVIDUAL_LIGHT_SUPPORT_WEAPON (10, "SA80 Individual/light support weapon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trigat */
-// autogenerated using string template disenumpart2.txt
-
     TRIGAT (11, "Trigat"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Milan AT missile */
-// autogenerated using string template disenumpart2.txt
-
-    MILAN_AT_MISSILE (12, "Milan AT missile"),;
-
-// autogenerated using string template disenumpart25.txt
+    MILAN_AT_MISSILE (12, "Milan AT missile");
 
     private int value;
     private final String description;
@@ -140,8 +87,6 @@ public enum LifeFormsSubcategoryUKWeapons implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUSWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUSWeapons.java
index 7122584251a77912c3d2319cef5c4519947fced8..40d835b0d3aa495305dea660304ec5d1eef46a51 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUSWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUSWeapons.java
@@ -7,750 +7,257 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 16,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 16 marshal size 8<br>
  * LifeFormsSubcategoryUSWeapons
  */
 public enum LifeFormsSubcategoryUSWeapons implements SubCategory
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Assault machine pistol, KF-AMP */
-// autogenerated using string template disenumpart2.txt
-
     ASSAULT_MACHINE_PISTOL_KF_AMP (1, "Assault machine pistol, KF-AMP"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Automatic model 1911A1 .45 */
-// autogenerated using string template disenumpart2.txt
-
     AUTOMATIC_MODEL_1911A1_45 (2, "Automatic model 1911A1 .45"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Combat Master Mark VI .45, Detronics */
-// autogenerated using string template disenumpart2.txt
-
     COMBAT_MASTER_MARK_VI_45_DETRONICS (3, "Combat Master Mark VI .45, Detronics"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** De-cocker KP90DC .45 */
-// autogenerated using string template disenumpart2.txt
-
     DE_COCKER_KP90DC_45 (4, "De-cocker KP90DC .45"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** De-cocker KP91DC .40 */
-// autogenerated using string template disenumpart2.txt
-
     DE_COCKER_KP91DC_40 (5, "De-cocker KP91DC .40"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** General officers Model 15 .45 */
-// autogenerated using string template disenumpart2.txt
-
     GENERAL_OFFICERS_MODEL_15_45 (6, "General officers Model 15 .45"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Nova 9-mm, LaFrance */
-// autogenerated using string template disenumpart2.txt
-
     NOVA_9_MM_LAFRANCE (7, "Nova 9-mm, LaFrance"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Personal Defense Weapon MP5K-PDW 9-mm */
-// autogenerated using string template disenumpart2.txt
-
     PERSONAL_DEFENSE_WEAPON_MP5K_PDW_9_MM (8, "Personal Defense Weapon MP5K-PDW 9-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Silenced Colt .45, LaFrance */
-// autogenerated using string template disenumpart2.txt
-
     SILENCED_COLT_45_LAFRANCE (9, "Silenced Colt .45, LaFrance"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5900-series 9-mm, Smith and Wesson (SandW) */
-// autogenerated using string template disenumpart2.txt
-
     _5900_SERIES_9_MM_SMITH_WESSON_SW (10, "5900-series 9-mm, Smith & Wesson (S&W)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M9 */
-// autogenerated using string template disenumpart2.txt
-
     M9 (11, "M9"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Model 1911A1, Springfield Armory */
-// autogenerated using string template disenumpart2.txt
-
     MODEL_1911A1_SPRINGFIELD_ARMORY (12, "Model 1911A1, Springfield Armory"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Model 2000 9-mm */
-// autogenerated using string template disenumpart2.txt
-
     MODEL_2000_9_MM (13, "Model 2000 9-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** P-9 9-mm, Springfield Armory */
-// autogenerated using string template disenumpart2.txt
-
     P_9_9_MM_SPRINGFIELD_ARMORY (14, "P-9 9-mm, Springfield Armory"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** P-12 9-mm */
-// autogenerated using string template disenumpart2.txt
-
     P_12_9_MM (15, "P-12 9-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** P-85 Mark II 9-mm, Ruger */
-// autogenerated using string template disenumpart2.txt
-
     P_85_MARK_II_9_MM_RUGER (16, "P-85 Mark II 9-mm, Ruger"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Advanced Combat Rifle 5.56-mm, AAI */
-// autogenerated using string template disenumpart2.txt
-
     ADVANCED_COMBAT_RIFLE_556_MM_AAI (17, "Advanced Combat Rifle 5.56-mm, AAI"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Commando assault rifle, Model 733 5.56-mm, Colt */
-// autogenerated using string template disenumpart2.txt
-
     COMMANDO_ASSAULT_RIFLE_MODEL_733_556_MM_COLT (18, "Commando assault rifle, Model 733 5.56-mm, Colt"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Infantry rifle, Mini-14/20 GB 5.56-mm, Ruger */
-// autogenerated using string template disenumpart2.txt
-
     INFANTRY_RIFLE_MINI_14_20_GB_556_MM_RUGER (19, "Infantry rifle, Mini-14/20 GB 5.56-mm, Ruger"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mini-14 5.56-mm, Ruger */
-// autogenerated using string template disenumpart2.txt
-
     MINI_14_556_MM_RUGER (20, "Mini-14 5.56-mm, Ruger"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mini Thirty 7.62-mm, Ruger */
-// autogenerated using string template disenumpart2.txt
-
     MINI_THIRTY_762_MM_RUGER (21, "Mini Thirty 7.62-mm, Ruger"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Semi-automatic model 82A2 .50, Barrett */
-// autogenerated using string template disenumpart2.txt
-
     SEMI_AUTOMATIC_MODEL_82A2_50_BARRETT (22, "Semi-automatic model 82A2 .50, Barrett"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sniper Weapon System M24 7.62-mm */
-// autogenerated using string template disenumpart2.txt
-
     SNIPER_WEAPON_SYSTEM_M24_762_MM (23, "Sniper Weapon System M24 7.62-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sniping rifle M21, Springfield Armory */
-// autogenerated using string template disenumpart2.txt
-
     SNIPING_RIFLE_M21_SPRINGFIELD_ARMORY (24, "Sniping rifle M21, Springfield Armory"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sniping rifle M40A1 7.62-mm */
-// autogenerated using string template disenumpart2.txt
-
     SNIPING_RIFLE_M40A1_762_MM (25, "Sniping rifle M40A1 7.62-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sniping rifle M600 7.62-mm */
-// autogenerated using string template disenumpart2.txt
-
     SNIPING_RIFLE_M600_762_MM (26, "Sniping rifle M600 7.62-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** AR-15 (M16) 5.56-mm */
-// autogenerated using string template disenumpart2.txt
-
     AR_15_M16_556_MM (27, "AR-15 (M16) 5.56-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M1 .30 */
-// autogenerated using string template disenumpart2.txt
-
     IDENTIFICATION_FRIEND_OR_FOE (28, "M1 .30"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M14 7.62-mm, NATO */
-// autogenerated using string template disenumpart2.txt
-
     M14_762_MM_NATO (29, "M14 7.62-mm, NATO"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M14 (M1A, M1A1-A1), Springfield Armory */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "M14 (M1A, M1A1-A1), Springfield Armory"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M14K assault rifle, LaFrance */
-// autogenerated using string template disenumpart2.txt
-
     M14K_ASSAULT_RIFLE_LAFRANCE (31, "M14K assault rifle, LaFrance"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M16A2 assault rifle 5.56-mm, Colt */
-// autogenerated using string template disenumpart2.txt
-
     M16A2_ASSAULT_RIFLE_556_MM_COLT (32, "M16A2 assault rifle 5.56-mm, Colt"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M21 7.62-mm, U.S. */
-// autogenerated using string template disenumpart2.txt
-
     M21_762_MM_US (33, "M21 7.62-mm, U.S."),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M77 Mark II 5.56-mm, Ruger */
-// autogenerated using string template disenumpart2.txt
-
     M77_MARK_II_556_MM_RUGER (34, "M77 Mark II 5.56-mm, Ruger"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M77V 7.62-mm, Ruger */
-// autogenerated using string template disenumpart2.txt
-
     M77V_762_MM_RUGER (35, "M77V 7.62-mm, Ruger"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** S-16 7.62 x 36-mm, Grendel */
-// autogenerated using string template disenumpart2.txt
-
     S_16_762_X_36_MM_GRENDEL (36, "S-16 7.62 x 36-mm, Grendel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SAR-8 7.62-mm */
-// autogenerated using string template disenumpart2.txt
-
     SAR_8_762_MM (37, "SAR-8 7.62-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SAR-4800 7.62-mm */
-// autogenerated using string template disenumpart2.txt
-
     SAR_4800_762_MM (38, "SAR-4800 7.62-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Assault carbine M16K, LaFrance */
-// autogenerated using string template disenumpart2.txt
-
     ASSAULT_CARBINE_M16K_LAFRANCE (39, "Assault carbine M16K, LaFrance"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M1 .30 */
-// autogenerated using string template disenumpart2.txt
-
     M1_30 (40, "M1 .30"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M4 (Model 720) 5.56-mm, Colt */
-// autogenerated using string template disenumpart2.txt
-
     M4_MODEL_720_556_MM_COLT (41, "M4 (Model 720) 5.56-mm, Colt"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M-900 9-mm, Calico */
-// autogenerated using string template disenumpart2.txt
-
     M_900_9_MM_CALICO (42, "M-900 9-mm, Calico"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** AC-556F 5.56-mm, Ruger */
-// autogenerated using string template disenumpart2.txt
-
     AC_556F_556_MM_RUGER (43, "AC-556F 5.56-mm, Ruger"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M3 .45 */
-// autogenerated using string template disenumpart2.txt
-
     M3_45 (44, "M3 .45"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M11, Cobray */
-// autogenerated using string template disenumpart2.txt
-
     M11_COBRAY (45, "M11, Cobray"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M951 9-mm, Calico */
-// autogenerated using string template disenumpart2.txt
-
     TIME_SPACE_POSITION_INFORMATION (46, "M951 9-mm, Calico"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** MP5/10 10-mm */
-// autogenerated using string template disenumpart2.txt
-
     MP5_10_10_MM (47, "MP5/10 10-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9-mm, Colt */
-// autogenerated using string template disenumpart2.txt
-
     _9_MM_COLT (48, "9-mm, Colt"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ingram */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_FIRE (49, "Ingram"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Externally powered (EPG) 7.62-mm, Ares */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "Externally powered (EPG) 7.62-mm, Ares"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** GECAL 50 */
-// autogenerated using string template disenumpart2.txt
-
     CREATE_ENTITY_RELIABLE (51, "GECAL 50"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** General purpose M60 7.62-mm */
-// autogenerated using string template disenumpart2.txt
-
     REMOVE_ENTITY_RELIABLE (52, "General purpose M60 7.62-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Heavy M2HB-QCB .50, RAMO */
-// autogenerated using string template disenumpart2.txt
-
     START_RESUME_RELIABLE (53, "Heavy M2HB-QCB .50, RAMO"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light assault M60E3 (Enhanced) 7.62-mm */
-// autogenerated using string template disenumpart2.txt
-
     STOP_FREEZE_RELIABLE (54, "Light assault M60E3 (Enhanced) 7.62-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light M16A2 5.56-mm, Colt */
-// autogenerated using string template disenumpart2.txt
-
     ACKNOWLEDGE_RELIABLE (55, "Light M16A2 5.56-mm, Colt"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light 5.56-mm, Ares */
-// autogenerated using string template disenumpart2.txt
-
     ACTION_REQUEST_RELIABLE (56, "Light 5.56-mm, Ares"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Lightweight M2 .50, RAMO */
-// autogenerated using string template disenumpart2.txt
-
     ACTION_RESPONSE_RELIABLE (57, "Lightweight M2 .50, RAMO"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Lightweight assault M60E3 7.62-mm */
-// autogenerated using string template disenumpart2.txt
-
     DATA_QUERY_RELIABLE (58, "Lightweight assault M60E3 7.62-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Minigun M134 7.62-mm, General Electric */
-// autogenerated using string template disenumpart2.txt
-
     SET_DATA_RELIABLE (59, "Minigun M134 7.62-mm, General Electric"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** MG system MK19 Mod 3, 40-mm */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "MG system MK19 Mod 3, 40-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** MG system (or kit) M2HB QCB .50, Saco Defense */
-// autogenerated using string template disenumpart2.txt
-
     EVENT_REPORT_RELIABLE (61, "MG system (or kit) M2HB QCB .50, Saco Defense"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M1919A4 .30-cal, Browning */
-// autogenerated using string template disenumpart2.txt
-
     COMMENT_RELIABLE (62, "M1919A4 .30-cal, Browning"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** .50-cal, Browning */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_RELIABLE (63, ".50-cal, Browning"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Colored-smoke hand grenade M18 */
-// autogenerated using string template disenumpart2.txt
-
     SET_RECORD_RELIABLE	 (64, "Colored-smoke hand grenade M18"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Colored-smoke grenades, Federal Laboratories */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_QUERY_RELIABLE (65, "Colored-smoke grenades, Federal Laboratories"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Infrared smoke grenade M76 */
-// autogenerated using string template disenumpart2.txt
-
     INFRARED_SMOKE_GRENADE_M76 (66, "Infrared smoke grenade M76"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Smoke hand grenade AN-M8 HC */
-// autogenerated using string template disenumpart2.txt
-
     SMOKE_HAND_GRENADE_AN_M8_HC (67, "Smoke hand grenade AN-M8 HC"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Delay fragmentation hand grenade M61 */
-// autogenerated using string template disenumpart2.txt
-
     DELAY_FRAGMENTATION_HAND_GRENADE_M61 (68, "Delay fragmentation hand grenade M61"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Delay fragmentation hand grenade M67 */
-// autogenerated using string template disenumpart2.txt
-
     DELAY_FRAGMENTATION_HAND_GRENADE_M67 (69, "Delay fragmentation hand grenade M67"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Impact fragmentation hand grenade M57 */
-// autogenerated using string template disenumpart2.txt
-
     IMPACT_FRAGMENTATION_HAND_GRENADE_M57 (70, "Impact fragmentation hand grenade M57"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Impact fragmentation hand grenade M68 */
-// autogenerated using string template disenumpart2.txt
-
     IMPACT_FRAGMENTATION_HAND_GRENADE_M68 (71, "Impact fragmentation hand grenade M68"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Incendiary hand grenade AN-M14 TH3 */
-// autogenerated using string template disenumpart2.txt
-
     INCENDIARY_HAND_GRENADE_AN_M14_TH3 (72, "Incendiary hand grenade AN-M14 TH3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Launcher I-M203 40-mm */
-// autogenerated using string template disenumpart2.txt
-
     LAUNCHER_I_M203_40_MM (73, "Launcher I-M203 40-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Launcher M79 40-mm */
-// autogenerated using string template disenumpart2.txt
-
     LAUNCHER_M79_40_MM (74, "Launcher M79 40-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Multiple grenade launcher MM-1 40-mm */
-// autogenerated using string template disenumpart2.txt
-
     MULTIPLE_GRENADE_LAUNCHER_MM_1_40_MM (75, "Multiple grenade launcher MM-1 40-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Multi-shot portable flame weapon M202A2 66-mm */
-// autogenerated using string template disenumpart2.txt
-
     MULTI_SHOT_PORTABLE_FLAME_WEAPON_M202A2_66_MM (76, "Multi-shot portable flame weapon M202A2 66-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Portable ABC-M9-7 */
-// autogenerated using string template disenumpart2.txt
-
     PORTABLE_ABC_M9_7 (77, "Portable ABC-M9-7"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Portable M2A1-7 */
-// autogenerated using string template disenumpart2.txt
-
     PORTABLE_M2A1_7 (78, "Portable M2A1-7"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Portable M9E1-7 */
-// autogenerated using string template disenumpart2.txt
-
     PORTABLE_M9E1_7 (79, "Portable M9E1-7"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dragon medium Anti-Armor missile, M47, FGM-77A */
-// autogenerated using string template disenumpart2.txt
-
     DRAGON_MEDIUM_ANTI_ARMOR_MISSILE_M47_FGM_77A (80, "Dragon medium Anti-Armor missile, M47, FGM-77A"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Javelin AAWS-M */
-// autogenerated using string template disenumpart2.txt
-
     JAVELIN_AAWS_M (81, "Javelin AAWS-M"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light Anti-Tank Weapon M72 (LAW II) */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT_ANTI_TANK_WEAPON_M72_LAW_II (82, "Light Anti-Tank Weapon M72 (LAW II)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Redeye, FIM-43, General Dynamics */
-// autogenerated using string template disenumpart2.txt
-
     REDEYE_FIM_43_GENERAL_DYNAMICS (83, "Redeye, FIM-43, General Dynamics"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Saber dual-purpose missile system */
-// autogenerated using string template disenumpart2.txt
-
     SABER_DUAL_PURPOSE_MISSILE_SYSTEM (84, "Saber dual-purpose missile system"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Stinger, FIM-92, General Dynamics */
-// autogenerated using string template disenumpart2.txt
-
     STINGER_FIM_92_GENERAL_DYNAMICS (85, "Stinger, FIM-92, General Dynamics"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** TOW heavy Anti-Tank weapon */
-// autogenerated using string template disenumpart2.txt
-
     TOW_HEAVY_ANTI_TANK_WEAPON (86, "TOW heavy Anti-Tank weapon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bear Trap AP device, Pancor */
-// autogenerated using string template disenumpart2.txt
-
     BEAR_TRAP_AP_DEVICE_PANCOR (87, "Bear Trap AP device, Pancor"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Chain Gun automatic weapon EX-34 7.62-mm */
-// autogenerated using string template disenumpart2.txt
-
     CHAIN_GUN_AUTOMATIC_WEAPON_EX_34_762_MM (88, "Chain Gun automatic weapon EX-34 7.62-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Close Assault Weapon System (CAWS), AAI */
-// autogenerated using string template disenumpart2.txt
-
     CLOSE_ASSAULT_WEAPON_SYSTEM_CAWS_AAI (89, "Close Assault Weapon System (CAWS), AAI"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** CAWS, Olin/Heckler and Koch */
-// autogenerated using string template disenumpart2.txt
-
     CAWS_OLIN_HECKLER_AND_KOCH (90, "CAWS, Olin/Heckler and Koch"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Crossfire SAM Model 88 */
-// autogenerated using string template disenumpart2.txt
-
     CROSSFIRE_SAM_MODEL_88 (91, "Crossfire SAM Model 88"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dragon and M16 */
-// autogenerated using string template disenumpart2.txt
-
     DRAGON_AND_M16 (92, "Dragon and M16"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Firing port weapon M231, 5.56-mm, Colt */
-// autogenerated using string template disenumpart2.txt
-
     FIRING_PORT_WEAPON_M231_556_MM_COLT (93, "Firing port weapon M231, 5.56-mm, Colt"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Foxhole Digger Explosive Kit (EXFODA) */
-// autogenerated using string template disenumpart2.txt
-
     FOXHOLE_DIGGER_EXPLOSIVE_KIT_EXFODA (94, "Foxhole Digger Explosive Kit (EXFODA)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Infantry Support Weapon ASP-30 {RM} 30-mm */
-// autogenerated using string template disenumpart2.txt
-
     INFANTRY_SUPPORT_WEAPON_ASP_30_RM_30_MM (95, "Infantry Support Weapon ASP-30 {RM} 30-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Jackhammer Mk 3-A2, Pancor */
-// autogenerated using string template disenumpart2.txt
-
     JACKHAMMER_MK_3_A2_PANCOR (96, "Jackhammer Mk 3-A2, Pancor"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light Anti-Armor weapon M136 (AT4) */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT_ANTI_ARMOR_WEAPON_M136_AT4 (97, "Light Anti-Armor weapon M136 (AT4)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M26A2 */
-// autogenerated using string template disenumpart2.txt
-
     M26A2 (98, "M26A2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Master Key S */
-// autogenerated using string template disenumpart2.txt
-
     MASTER_KEY_S (99, "Master Key S"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Minigun 5.56-mm */
-// autogenerated using string template disenumpart2.txt
-
     MINIGUN_556_MM (100, "Minigun 5.56-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Multipurpose Individual Munition (MPIM), Marquardt */
-// autogenerated using string template disenumpart2.txt
-
     MULTIPURPOSE_INDIVIDUAL_MUNITION_MPIM_MARQUARDT (101, "Multipurpose Individual Munition (MPIM), Marquardt"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Multipurpose weapon AT8 */
-// autogenerated using string template disenumpart2.txt
-
     MULTIPURPOSE_WEAPON_AT8 (102, "Multipurpose weapon AT8"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Recoilless rifle M40, M40A2, and M40A4; 106-mm */
-// autogenerated using string template disenumpart2.txt
-
     RECOILLESS_RIFLE_M40_M40A2_AND_M40A4_106_MM (103, "Recoilless rifle M40, M40A2, and M40A4; 106-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Recoilless rifle M67, 90-mm */
-// autogenerated using string template disenumpart2.txt
-
     RECOILLESS_RIFLE_M67_90_MM (104, "Recoilless rifle M67, 90-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Revolver, SP 101 */
-// autogenerated using string template disenumpart2.txt
-
     REVOLVER_SP_101 (105, "Revolver, SP 101"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Revolver, Super Redhawk .44 magnum, Ruger */
-// autogenerated using string template disenumpart2.txt
-
     REVOLVER_SUPER_REDHAWK_44_MAGNUM_RUGER (106, "Revolver, Super Redhawk .44 magnum, Ruger"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** RAW rocket, 140-mm, Brunswick */
-// autogenerated using string template disenumpart2.txt
-
     RAW_ROCKET_140_MM_BRUNSWICK (107, "RAW rocket, 140-mm, Brunswick"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Rifle-launcher Anti-Armor Munition (RAAM), Olin */
-// autogenerated using string template disenumpart2.txt
-
     RIFLE_LAUNCHER_ANTI_ARMOR_MUNITION_RAAM_OLIN (108, "Rifle-launcher Anti-Armor Munition (RAAM), Olin"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Rocket launcher M-20 3.5-in */
-// autogenerated using string template disenumpart2.txt
-
     ROCKET_LAUNCHER_M_20_35_IN (109, "Rocket launcher M-20 3.5-in"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Rocket launcher, Enhanced M72 E series HEAT, 66-mm */
-// autogenerated using string template disenumpart2.txt
-
     ROCKET_LAUNCHER_ENHANCED_M72_E_SERIES_HEAT_66_MM (110, "Rocket launcher, Enhanced M72 E series HEAT, 66-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Selective fire weapon AC-556 5.56-mm, Ruger */
-// autogenerated using string template disenumpart2.txt
-
     SELECTIVE_FIRE_WEAPON_AC_556_556_MM_RUGER (111, "Selective fire weapon AC-556 5.56-mm, Ruger"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Selective fire weapon AC-556F 5.56-mm, Ruger */
-// autogenerated using string template disenumpart2.txt
-
     SELECTIVE_FIRE_WEAPON_AC_556F_556_MM_RUGER (112, "Selective fire weapon AC-556F 5.56-mm, Ruger"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Shotgun M870 Mk 1 (U.S. Marine Corps), Remington */
-// autogenerated using string template disenumpart2.txt
-
     SHOTGUN_M870_MK_1_US_MARINE_CORPS_REMINGTON (113, "Shotgun M870 Mk 1 (U.S. Marine Corps), Remington"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SMAW Mk 193, 83-mm, McDonnell-Douglas */
-// autogenerated using string template disenumpart2.txt
-
     SMAW_MK_193_83_MM_MCDONNELL_DOUGLAS (114, "SMAW Mk 193, 83-mm, McDonnell-Douglas"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SMAW-D: Disposable SMAW */
-// autogenerated using string template disenumpart2.txt
-
     SMAW_D_DISPOSABLE_SMAW (115, "SMAW-D: Disposable SMAW"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Squad Automatic Weapon (SAW) M249 5.56-mm */
-// autogenerated using string template disenumpart2.txt
-
     SQUAD_AUTOMATIC_WEAPON_SAW_M249_556_MM (116, "Squad Automatic Weapon (SAW) M249 5.56-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tactical Support Weapon 50/12, .50-cal, Peregrine */
-// autogenerated using string template disenumpart2.txt
-
     TACTICAL_SUPPORT_WEAPON_50_12_50_CAL_PEREGRINE (117, "Tactical Support Weapon 50/12, .50-cal, Peregrine"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Telescoped Ammunition Revolver Gun (TARG) .50-cal, Ares */
-// autogenerated using string template disenumpart2.txt
-
     TELESCOPED_AMMUNITION_REVOLVER_GUN_TARG_50_CAL_ARES (118, "Telescoped Ammunition Revolver Gun (TARG) .50-cal, Ares"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ultimate over-under combination, Ciener */
-// autogenerated using string template disenumpart2.txt
-
     ULTIMATE_OVER_UNDER_COMBINATION_CIENER (119, "Ultimate over-under combination, Ciener"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** M18A1 Claymore mine */
-// autogenerated using string template disenumpart2.txt
-
     M18A1_CLAYMORE_MINE (120, "M18A1 Claymore mine"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mortar 81-mm */
-// autogenerated using string template disenumpart2.txt
-
     MORTAR_81_MM (121, "Mortar 81-mm"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Machinegun M240 7.62mm */
-// autogenerated using string template disenumpart2.txt
-
-    MACHINEGUN_M240_762MM (134, "Machinegun M240 7.62mm"),;
-
-// autogenerated using string template disenumpart25.txt
+    MACHINEGUN_M240_762MM (134, "Machinegun M240 7.62mm");
 
     private int value;
     private final String description;
@@ -800,8 +307,6 @@ public enum LifeFormsSubcategoryUSWeapons implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeSavingEquipment.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeSavingEquipment.java
index 156a5caf3a9b09258aebc0d88e5d7745b843d813..6160f00b44746d632d4ee8e345a4ed3649a9fe1b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeSavingEquipment.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeSavingEquipment.java
@@ -7,43 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 633, marshal size 8,
- * LifeSavingEquipment
+ * Generated from XML, <br>
+ * UID 633 marshal size 8<br>
+ * LifeSavingEquipment<br>
  * Subcategories for Surface Platform Category 101. For Subcategory 1-3. Use the Extra field to specify the capacity 1-255 persons.
  */
 public enum LifeSavingEquipment implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Lifeboat */
-// autogenerated using string template disenumpart2.txt
-
     LIFEBOAT (1, "Lifeboat"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Liferaft */
-// autogenerated using string template disenumpart2.txt
-
     LIFERAFT (2, "Liferaft"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** MOB Boat */
-// autogenerated using string template disenumpart2.txt
-
     MOB_BOAT (3, "MOB Boat"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Lifebuoy */
-// autogenerated using string template disenumpart2.txt
-
-    LIFEBUOY (4, "Lifebuoy"),;
-
-// autogenerated using string template disenumpart25.txt
+    LIFEBUOY (4, "Lifebuoy");
 
     private int value;
     private final String description;
@@ -93,8 +73,6 @@ public enum LifeSavingEquipment implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BDataTerminalSetIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BDataTerminalSetIndicator.java
index eaa69b78240cdee52f91f2f4c530021239e66735..a50c77de145386561dcef60c7ddc238982b6454e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BDataTerminalSetIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BDataTerminalSetIndicator.java
@@ -7,66 +7,29 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 469,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 469 marshal size 8<br>
  * Link11DataTerminalSetIndicator
  */
 public enum Link1111BDataTerminalSetIndicator 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Transmit */
-// autogenerated using string template disenumpart2.txt
-
     TRANSMIT (1, "Transmit"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Receive */
-// autogenerated using string template disenumpart2.txt
-
     RECEIVE (2, "Receive"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Net Busy */
-// autogenerated using string template disenumpart2.txt
-
     NET_BUSY (3, "Net Busy"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Transmit Data Error */
-// autogenerated using string template disenumpart2.txt
-
     TRANSMIT_DATA_ERROR (4, "Transmit Data Error"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Receive Data Error */
-// autogenerated using string template disenumpart2.txt
-
     RECEIVE_DATA_ERROR (5, "Receive Data Error"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Code Error */
-// autogenerated using string template disenumpart2.txt
-
     CODE_ERROR (6, "Code Error"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Synchronization Complete */
-// autogenerated using string template disenumpart2.txt
-
-    SYNCHRONIZATION_COMPLETE (7, "Synchronization Complete"),;
-
-// autogenerated using string template disenumpart25.txt
+    SYNCHRONIZATION_COMPLETE (7, "Synchronization Complete");
 
     private int value;
     private final String description;
@@ -116,8 +79,6 @@ public enum Link1111BDataTerminalSetIndicator
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BEncryptionFlag.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BEncryptionFlag.java
index df1632a6ad987e2c7389731137959d515f2981c9..8a11e416928cdc6b78dad3b7038b71939af31348 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BEncryptionFlag.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BEncryptionFlag.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 735,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 735 marshal size 8<br>
  * Link1111BEncryptionFlag
  */
 public enum Link1111BEncryptionFlag 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Encryption Used */
-// autogenerated using string template disenumpart2.txt
-
     NO_ENCRYPTION_USED (0, "No Encryption Used"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Encryption Used */
-// autogenerated using string template disenumpart2.txt
-
-    ENCRYPTION_USED (1, "Encryption Used"),;
-
-// autogenerated using string template disenumpart25.txt
+    ENCRYPTION_USED (1, "Encryption Used");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum Link1111BEncryptionFlag
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BFidelityLevel.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BFidelityLevel.java
index 8e5335370751dcfffa3af52a09a7e5db5319764c..01086a8428a291c19ae26b8585cb616473fa6d06 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BFidelityLevel.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BFidelityLevel.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 467,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 467 marshal size 8<br>
  * Link1111BFidelityLevel
  */
 public enum Link1111BFidelityLevel 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fidelity Level 0 */
-// autogenerated using string template disenumpart2.txt
-
     FIDELITY_LEVEL_0 (0, "Fidelity Level 0"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fidelity Level 1 */
-// autogenerated using string template disenumpart2.txt
-
     FIDELITY_LEVEL_1 (1, "Fidelity Level 1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fidelity Level 2 */
-// autogenerated using string template disenumpart2.txt
-
-    FIDELITY_LEVEL_2 (2, "Fidelity Level 2"),;
-
-// autogenerated using string template disenumpart25.txt
+    FIDELITY_LEVEL_2 (2, "Fidelity Level 2");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum Link1111BFidelityLevel
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BTerminalMode.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BTerminalMode.java
index 071dc188f373ee16454c049644fb6736ec5f2ae3..2e2792b0980ac1fc9d9ef30b2a8edf8c523d842e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BTerminalMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BTerminalMode.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 468,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 468 marshal size 8<br>
  * Link11TerminalMode
  */
 public enum Link1111BTerminalMode 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Network Control Station */
-// autogenerated using string template disenumpart2.txt
-
     NETWORK_CONTROL_STATION (1, "Network Control Station"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Participating Unit */
-// autogenerated using string template disenumpart2.txt
-
-    PARTICIPATING_UNIT (2, "Participating Unit"),;
-
-// autogenerated using string template disenumpart25.txt
+    PARTICIPATING_UNIT (2, "Participating Unit");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum Link1111BTerminalMode
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link11BDataSignalingRate.java b/src-generated/edu/nps/moves/dis7/enumerations/Link11BDataSignalingRate.java
index 58ab700bfbab6c165f72b203de784b3a5392030c..d151e480c5a503e5d405dc6ac70f31b1c2f1b172 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link11BDataSignalingRate.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link11BDataSignalingRate.java
@@ -7,54 +7,25 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 740,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 740 marshal size 8<br>
  * Link11BDataSignalingRate
  */
 public enum Link11BDataSignalingRate 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Used */
-// autogenerated using string template disenumpart2.txt
-
     NOT_USED (1, "Not Used"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Used */
-// autogenerated using string template disenumpart2.txt
-
     NOT_USED_2 (2, "Not Used"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 1200 bps */
-// autogenerated using string template disenumpart2.txt
-
     _1200_BPS (3, "1200 bps"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 2400 bps */
-// autogenerated using string template disenumpart2.txt
-
     _2400_BPS (4, "2400 bps"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 600 bps */
-// autogenerated using string template disenumpart2.txt
-
-    _600_BPS (5, "600 bps"),;
-
-// autogenerated using string template disenumpart25.txt
+    _600_BPS (5, "600 bps");
 
     private int value;
     private final String description;
@@ -104,8 +75,6 @@ public enum Link11BDataSignalingRate
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link11BLinkState.java b/src-generated/edu/nps/moves/dis7/enumerations/Link11BLinkState.java
index e4b0a4c35dce9f34d396c229df584118ef1ff60d..a36ea0578b2e25a77db87fa6937adf3b2f895dfc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link11BLinkState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link11BLinkState.java
@@ -7,48 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 737,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 737 marshal size 8<br>
  * Link11BLinkState
  */
 public enum Link11BLinkState 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Inactive */
-// autogenerated using string template disenumpart2.txt
-
     INACTIVE (1, "Inactive"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ready */
-// autogenerated using string template disenumpart2.txt
-
     READY (2, "Ready"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Active */
-// autogenerated using string template disenumpart2.txt
-
     ACTIVE (3, "Active"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Operational */
-// autogenerated using string template disenumpart2.txt
-
-    OPERATIONAL (4, "Operational"),;
-
-// autogenerated using string template disenumpart25.txt
+    OPERATIONAL (4, "Operational");
 
     private int value;
     private final String description;
@@ -98,8 +73,6 @@ public enum Link11BLinkState
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link11BMessageSubType.java b/src-generated/edu/nps/moves/dis7/enumerations/Link11BMessageSubType.java
index e493a3448f08e20f7a020138cd69d263c721054f..b50e82c8255c632ed0952115747c51beb291d6f1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link11BMessageSubType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link11BMessageSubType.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 739,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 739 marshal size 8<br>
  * Link11BMessageSubType
  */
 public enum Link11BMessageSubType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Transmission Frame */
-// autogenerated using string template disenumpart2.txt
-
     TRANSMISSION_FRAME (1, "Transmission Frame"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Standby Signal */
-// autogenerated using string template disenumpart2.txt
-
-    STANDBY_SIGNAL (2, "Standby Signal"),;
-
-// autogenerated using string template disenumpart25.txt
+    STANDBY_SIGNAL (2, "Standby Signal");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum Link11BMessageSubType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link11BModulationStandard.java b/src-generated/edu/nps/moves/dis7/enumerations/Link11BModulationStandard.java
index 7c291ccfedce84d5035f483fba8de98282d3cf6c..a9a972b89d69044e3bdb4944e9734155bfd3c99f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link11BModulationStandard.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link11BModulationStandard.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 741,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 741 marshal size 8<br>
  * Link11BModulationStandard
  */
 public enum Link11BModulationStandard 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** CCITT V.23 */
-// autogenerated using string template disenumpart2.txt
-
-    CCITT_V23 (1, "CCITT V.23"),;
-
-// autogenerated using string template disenumpart25.txt
+    CCITT_V23 (1, "CCITT V.23");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum Link11BModulationStandard
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link11DataSignallingRate.java b/src-generated/edu/nps/moves/dis7/enumerations/Link11DataSignallingRate.java
index e84b2395b18a91ae0b0dcecba9384ee59a180b6d..6d61c76b7e3fd64fcf3b4d458951b951db5d15d1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link11DataSignallingRate.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link11DataSignallingRate.java
@@ -7,48 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 732,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 732 marshal size 8<br>
  * Link11DataSignallingRate
  */
 public enum Link11DataSignallingRate 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 1364 bps */
-// autogenerated using string template disenumpart2.txt
-
     _1364_BPS (1, "1364 bps"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 2250 bps */
-// autogenerated using string template disenumpart2.txt
-
     _2250_BPS (2, "2250 bps"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 1200 bps */
-// autogenerated using string template disenumpart2.txt
-
     _1200_BPS (3, "1200 bps"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 2400 bps */
-// autogenerated using string template disenumpart2.txt
-
-    _2400_BPS (4, "2400 bps"),;
-
-// autogenerated using string template disenumpart25.txt
+    _2400_BPS (4, "2400 bps");
 
     private int value;
     private final String description;
@@ -98,8 +73,6 @@ public enum Link11DataSignallingRate
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link11MessageSubType.java b/src-generated/edu/nps/moves/dis7/enumerations/Link11MessageSubType.java
index c1fca8c67b4980a4538f72474ab02412be1d2bb4..e13fee550b81ddbd344d66d33c17b85b968ee44f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link11MessageSubType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link11MessageSubType.java
@@ -7,48 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 730,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 730 marshal size 8<br>
  * Link11MessageSubType
  */
 public enum Link11MessageSubType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Interrogation */
-// autogenerated using string template disenumpart2.txt
-
     INTERROGATION (1, "Interrogation"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Intermediate Data */
-// autogenerated using string template disenumpart2.txt
-
     INTERMEDIATE_DATA (2, "Intermediate Data"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Final Data */
-// autogenerated using string template disenumpart2.txt
-
     FINAL_DATA (3, "Final Data"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Final Data and Interrogation */
-// autogenerated using string template disenumpart2.txt
-
-    FINAL_DATA_AND_INTERROGATION (4, "Final Data and Interrogation"),;
-
-// autogenerated using string template disenumpart25.txt
+    FINAL_DATA_AND_INTERROGATION (4, "Final Data and Interrogation");
 
     private int value;
     private final String description;
@@ -98,8 +73,6 @@ public enum Link11MessageSubType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link11MessageTypeIdentifier.java b/src-generated/edu/nps/moves/dis7/enumerations/Link11MessageTypeIdentifier.java
index b37040c732b4714c65c2653241f3eb958ec0c567..a8e5b963c875527bd93aa86252b82dd0f2b0ac52 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link11MessageTypeIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link11MessageTypeIdentifier.java
@@ -7,60 +7,27 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 731,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 731 marshal size 8<br>
  * Link11MessageTypeIdentifier
  */
 public enum Link11MessageTypeIdentifier 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Net Test */
-// autogenerated using string template disenumpart2.txt
-
     NET_TEST (1, "Net Test"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Roll Call */
-// autogenerated using string template disenumpart2.txt
-
     ROLL_CALL (2, "Roll Call"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Picket Reply */
-// autogenerated using string template disenumpart2.txt
-
     PICKET_REPLY (3, "Picket Reply"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Short Broadcast */
-// autogenerated using string template disenumpart2.txt
-
     SHORT_BROADCAST (4, "Short Broadcast"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Broadcast */
-// autogenerated using string template disenumpart2.txt
-
     BROADCAST (5, "Broadcast"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Net Sync */
-// autogenerated using string template disenumpart2.txt
-
-    NET_SYNC (6, "Net Sync"),;
-
-// autogenerated using string template disenumpart25.txt
+    NET_SYNC (6, "Net Sync");
 
     private int value;
     private final String description;
@@ -110,8 +77,6 @@ public enum Link11MessageTypeIdentifier
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link11SignalIntegrationInterval.java b/src-generated/edu/nps/moves/dis7/enumerations/Link11SignalIntegrationInterval.java
index 628d2680d0cd0fcb9dbf08a65bbd2a89c9195a3e..3704c18bde0dacb0c0bbb88233e319ab59b2bd80 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link11SignalIntegrationInterval.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link11SignalIntegrationInterval.java
@@ -7,37 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 733, marshal size 8,
- * Link11SignalIntegrationInterval
+ * Generated from XML, <br>
+ * UID 733 marshal size 8<br>
+ * Link11SignalIntegrationInterval<br>
  * UID table only for historical purposes. Do not add new entries
  */
 public enum Link11SignalIntegrationInterval 
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 9 ms */
-// autogenerated using string template disenumpart2.txt
-
     _9_MS (1, "9 ms"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 18 ms */
-// autogenerated using string template disenumpart2.txt
-
-    _18_MS (2, "18 ms"),;
-
-// autogenerated using string template disenumpart25.txt
+    _18_MS (2, "18 ms");
 
     private int value;
     private final String description;
@@ -87,8 +71,6 @@ public enum Link11SignalIntegrationInterval
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link11SignalWaveform.java b/src-generated/edu/nps/moves/dis7/enumerations/Link11SignalWaveform.java
index dac6fb0df3b50f115e031ab1b0c97aa399612609..a0ba81b9269bcdfa9a39e13d78a51e3ea5eeb481 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link11SignalWaveform.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link11SignalWaveform.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 734,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 734 marshal size 8<br>
  * Link11SignalWaveform
  */
 public enum Link11SignalWaveform 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement - CLEW Format */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT_CLEW_FORMAT (0, "No Statement - CLEW Format"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Conventional Link Eleven Waveform (CLEW) */
-// autogenerated using string template disenumpart2.txt
-
     CONVENTIONAL_LINK_ELEVEN_WAVEFORM_CLEW (1, "Conventional Link Eleven Waveform (CLEW)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Single Tone Link Eleven Waveform (SLEW) */
-// autogenerated using string template disenumpart2.txt
-
-    SINGLE_TONE_LINK_ELEVEN_WAVEFORM_SLEW (2, "Single Tone Link Eleven Waveform (SLEW)"),;
-
-// autogenerated using string template disenumpart25.txt
+    SINGLE_TONE_LINK_ELEVEN_WAVEFORM_SLEW (2, "Single Tone Link Eleven Waveform (SLEW)");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum Link11SignalWaveform
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link16Version.java b/src-generated/edu/nps/moves/dis7/enumerations/Link16Version.java
index 3d5b29d621d7f7614b4ca6f96dfa158492b10a18..dc9bc51ac44e47d5c9bcc82788b7359df2ee64f7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link16Version.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link16Version.java
@@ -7,78 +7,33 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 800,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 800 marshal size 8<br>
  * Link16Version
  */
 public enum Link16Version 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** MIL-STD-6016C */
-// autogenerated using string template disenumpart2.txt
-
     MIL_STD_6016C (1, "MIL-STD-6016C"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** MIL-STD-6016D */
-// autogenerated using string template disenumpart2.txt
-
     MIL_STD_6016D (2, "MIL-STD-6016D"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** MIL-STD-6016E */
-// autogenerated using string template disenumpart2.txt
-
     MIL_STD_6016E (3, "MIL-STD-6016E"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** MIL-STD-6016F */
-// autogenerated using string template disenumpart2.txt
-
     MIL_STD_6016F (4, "MIL-STD-6016F"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** MIL-STD-6016F C1 */
-// autogenerated using string template disenumpart2.txt
-
     MIL_STD_6016F_C1 (5, "MIL-STD-6016F C1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** STANAG 5516 Ed 3 */
-// autogenerated using string template disenumpart2.txt
-
     STANAG_5516_ED_3 (103, "STANAG 5516 Ed 3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** STANAG 5516 Ed 4 */
-// autogenerated using string template disenumpart2.txt
-
     STANAG_5516_ED_4 (104, "STANAG 5516 Ed 4"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** STANAG 5516 Ed 5 */
-// autogenerated using string template disenumpart2.txt
-
     STANAG_5516_ED_5 (105, "STANAG 5516 Ed 5"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** STANAG 5516 Ed 6 */
-// autogenerated using string template disenumpart2.txt
-
-    STANAG_5516_ED_6 (106, "STANAG 5516 Ed 6"),;
-
-// autogenerated using string template disenumpart25.txt
+    STANAG_5516_ED_6 (106, "STANAG 5516 Ed 6");
 
     private int value;
     private final String description;
@@ -128,8 +83,6 @@ public enum Link16Version
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Material.java b/src-generated/edu/nps/moves/dis7/enumerations/Material.java
index 1f58e0697f06df5fb6a983dbf83708e0713a022e..8dc113ccd5f837b32427fe97d09af4dd77a8a3c4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Material.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Material.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 466,
- * marshal size 4,
+ * Generated from XML, <br>
+ * UID 466 marshal size 4<br>
  * Material
  */
 public enum Material 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Specified */
-// autogenerated using string template disenumpart2.txt
-
     NOT_SPECIFIED (0, "Not Specified"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Plastic */
-// autogenerated using string template disenumpart2.txt
-
     PLASTIC (1, "Plastic"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Rubber */
-// autogenerated using string template disenumpart2.txt
-
     RUBBER (2, "Rubber"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Road */
-// autogenerated using string template disenumpart2.txt
-
-    ROAD (3, "Road"),;
-
-// autogenerated using string template disenumpart25.txt
+    ROAD (3, "Road");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum Material
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MessageTypeIdentifier.java b/src-generated/edu/nps/moves/dis7/enumerations/MessageTypeIdentifier.java
index ce9995eccbc47282639d2369e555009c0157e6ca..f8e0da7d70fd992b8a5bcdf2448b6c526acf7aa5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MessageTypeIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MessageTypeIdentifier.java
@@ -7,66 +7,29 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 176,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 176 marshal size 8<br>
  * MessageTypeIdentifier
  */
 public enum MessageTypeIdentifier 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** JTIDS Header/Messages */
-// autogenerated using string template disenumpart2.txt
-
     JTIDS_HEADER_MESSAGES (0, "JTIDS Header/Messages"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** RTT A/B */
-// autogenerated using string template disenumpart2.txt
-
     RTT_A_B (1, "RTT A/B"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** RTT Reply */
-// autogenerated using string template disenumpart2.txt
-
     RTT_REPLY (2, "RTT Reply"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** JTIDS Voice CVSD */
-// autogenerated using string template disenumpart2.txt
-
     JTIDS_VOICE_CVSD (3, "JTIDS Voice CVSD"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** JTIDS Voice LPC10 */
-// autogenerated using string template disenumpart2.txt
-
     JTIDS_VOICE_LPC10 (4, "JTIDS Voice LPC10"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** JTIDS Voice LPC12 */
-// autogenerated using string template disenumpart2.txt
-
     JTIDS_VOICE_LPC12 (5, "JTIDS Voice LPC12"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** JTIDS LET */
-// autogenerated using string template disenumpart2.txt
-
     JTIDS_LET (6, "JTIDS LET"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** VMF */
-// autogenerated using string template disenumpart2.txt
-
-    VMF (7, "VMF"),;
-
-// autogenerated using string template disenumpart25.txt
+    VMF (7, "VMF");
 
     private int value;
     private final String description;
@@ -116,8 +79,6 @@ public enum MessageTypeIdentifier
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceActiveStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceActiveStatus.java
index bd8e218bc3a1c9fab3f0ef4204e954fa774581ca..03858354b19cab71c8cd4cd219fdfd8073c2be30 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceActiveStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceActiveStatus.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 419,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 419 marshal size 1<br>
  * MinefieldAppearanceActiveStatus
  */
 public enum MinefieldAppearanceActiveStatus 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Active */
-// autogenerated using string template disenumpart2.txt
-
     ACTIVE (0, "Active"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Inactive */
-// autogenerated using string template disenumpart2.txt
-
-    INACTIVE (1, "Inactive"),;
-
-// autogenerated using string template disenumpart25.txt
+    INACTIVE (1, "Inactive");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum MinefieldAppearanceActiveStatus
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceLane.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceLane.java
index adcf092f6048b719f0eaa23669ab48f084154475..2d23507e303b162f876f81c4ba951f625f7d71b5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceLane.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceLane.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 420,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 420 marshal size 1<br>
  * MinefieldAppearanceLane
  */
 public enum MinefieldAppearanceLane 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Minefield Has Active Lane */
-// autogenerated using string template disenumpart2.txt
-
     MINEFIELD_HAS_ACTIVE_LANE (0, "Minefield Has Active Lane"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Minefield Has an Inactive Lane */
-// autogenerated using string template disenumpart2.txt
-
-    MINEFIELD_HAS_AN_INACTIVE_LANE (1, "Minefield Has an Inactive Lane"),;
-
-// autogenerated using string template disenumpart25.txt
+    MINEFIELD_HAS_AN_INACTIVE_LANE (1, "Minefield Has an Inactive Lane");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum MinefieldAppearanceLane
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceMinefieldType.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceMinefieldType.java
index 02113121b0996fa5749ac25ebca00f8c87070a37..00271f30f4ee0ee51add1d38fdad64a7d0f7014f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceMinefieldType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceMinefieldType.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 418,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 418 marshal size 2<br>
  * MinefieldAppearanceMinefieldType
  */
 public enum MinefieldAppearanceMinefieldType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mixed Anti-Personnel and Anti-Tank Minefield */
-// autogenerated using string template disenumpart2.txt
-
     MIXED_ANTI_PERSONNEL_AND_ANTI_TANK_MINEFIELD (0, "Mixed Anti-Personnel and Anti-Tank Minefield"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pure Anti-Personnel Minefield */
-// autogenerated using string template disenumpart2.txt
-
     PURE_ANTI_PERSONNEL_MINEFIELD (1, "Pure Anti-Personnel Minefield"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pure Anti-Tank Minefield */
-// autogenerated using string template disenumpart2.txt
-
-    PURE_ANTI_TANK_MINEFIELD (2, "Pure Anti-Tank Minefield"),;
-
-// autogenerated using string template disenumpart25.txt
+    PURE_ANTI_TANK_MINEFIELD (2, "Pure Anti-Tank Minefield");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum MinefieldAppearanceMinefieldType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceState.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceState.java
index 5780a04b8b2cab3c475575272975af27bcc89cc1..b139d1a23f4d8d0a9e0ecddebab96c8344857eef 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceState.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 421,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 421 marshal size 1<br>
  * MinefieldAppearanceState
  */
 public enum MinefieldAppearanceState 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Active */
-// autogenerated using string template disenumpart2.txt
-
     ACTIVE (0, "Active"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Deactivated */
-// autogenerated using string template disenumpart2.txt
-
-    DEACTIVATED (1, "Deactivated"),;
-
-// autogenerated using string template disenumpart25.txt
+    DEACTIVATED (1, "Deactivated");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum MinefieldAppearanceState
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldFusingFuseType.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldFusingFuseType.java
index edbe80c289eb75ec983a9c0e64241bb63d84bb5f..c9b5b5cb7ff75286be2ce82d6ec35793b70acb0e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldFusingFuseType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldFusingFuseType.java
@@ -7,60 +7,27 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 422,
- * marshal size 7,
+ * Generated from XML, <br>
+ * UID 422 marshal size 7<br>
  * MinefieldFusingFuseType
  */
 public enum MinefieldFusingFuseType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Fuse */
-// autogenerated using string template disenumpart2.txt
-
     NO_FUSE (0, "No Fuse"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (1, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pressure */
-// autogenerated using string template disenumpart2.txt
-
     PRESSURE (2, "Pressure"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Magnetic */
-// autogenerated using string template disenumpart2.txt
-
     MAGNETIC (3, "Magnetic"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tilt Rod */
-// autogenerated using string template disenumpart2.txt
-
     TILT_ROD (4, "Tilt Rod"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Command */
-// autogenerated using string template disenumpart2.txt
-
     COMMAND (5, "Command"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trip Wire */
-// autogenerated using string template disenumpart2.txt
-
-    TRIP_WIRE (6, "Trip Wire"),;
-
-// autogenerated using string template disenumpart25.txt
+    TRIP_WIRE (6, "Trip Wire");
 
     private int value;
     private final String description;
@@ -110,8 +77,6 @@ public enum MinefieldFusingFuseType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemeAlgae.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemeAlgae.java
index 1d8e8c37ebe4b6aab99334bcbc13c85daa54bd36..fd5bcb28f1b155a77cd7a7205aa2acb6cc33de57 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemeAlgae.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemeAlgae.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 424,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 424 marshal size 2<br>
  * MinefieldPaintSchemeAlgae
  */
 public enum MinefieldPaintSchemeAlgae 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** None */
-// autogenerated using string template disenumpart2.txt
-
     NONE (0, "None"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT (1, "Light"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Moderate */
-// autogenerated using string template disenumpart2.txt
-
     MODERATE (2, "Moderate"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Heavy */
-// autogenerated using string template disenumpart2.txt
-
-    HEAVY (3, "Heavy"),;
-
-// autogenerated using string template disenumpart25.txt
+    HEAVY (3, "Heavy");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum MinefieldPaintSchemeAlgae
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemePaintScheme.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemePaintScheme.java
index a15d6c7d161465f3223344b00fd7eb8a21a66fac..f8981f6d7f44783622c78608b0950dc1ce66ce92 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemePaintScheme.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemePaintScheme.java
@@ -7,132 +7,51 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 425,
- * marshal size 6,
+ * Generated from XML, <br>
+ * UID 425 marshal size 6<br>
  * MinefieldPaintSchemePaintScheme
  */
 public enum MinefieldPaintSchemePaintScheme 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Standard */
-// autogenerated using string template disenumpart2.txt
-
     STANDARD (1, "Standard"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Camouflage Desert */
-// autogenerated using string template disenumpart2.txt
-
     CAMOUFLAGE_DESERT (2, "Camouflage Desert"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Camouflage Jungle */
-// autogenerated using string template disenumpart2.txt
-
     CAMOUFLAGE_JUNGLE (3, "Camouflage Jungle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Camouflage Snow */
-// autogenerated using string template disenumpart2.txt
-
     CAMOUFLAGE_SNOW (4, "Camouflage Snow"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Camouflage Gravel */
-// autogenerated using string template disenumpart2.txt
-
     CAMOUFLAGE_GRAVEL (5, "Camouflage Gravel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Camouflage Pavement */
-// autogenerated using string template disenumpart2.txt
-
     CAMOUFLAGE_PAVEMENT (6, "Camouflage Pavement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Camouflage Sand */
-// autogenerated using string template disenumpart2.txt
-
     CAMOUFLAGE_SAND (7, "Camouflage Sand"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Natural Wood */
-// autogenerated using string template disenumpart2.txt
-
     NATURAL_WOOD (8, "Natural Wood"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Clear */
-// autogenerated using string template disenumpart2.txt
-
     CLEAR (9, "Clear"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Red */
-// autogenerated using string template disenumpart2.txt
-
     RED (10, "Red"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Blue */
-// autogenerated using string template disenumpart2.txt
-
     BLUE (11, "Blue"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Green */
-// autogenerated using string template disenumpart2.txt
-
     GREEN (12, "Green"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Olive */
-// autogenerated using string template disenumpart2.txt
-
     OLIVE (13, "Olive"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** White */
-// autogenerated using string template disenumpart2.txt
-
     WHITE (14, "White"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tan */
-// autogenerated using string template disenumpart2.txt
-
     TAN (15, "Tan"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Black */
-// autogenerated using string template disenumpart2.txt
-
     BLACK (16, "Black"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Yellow */
-// autogenerated using string template disenumpart2.txt
-
     YELLOW (17, "Yellow"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Brown */
-// autogenerated using string template disenumpart2.txt
-
-    BROWN (18, "Brown"),;
-
-// autogenerated using string template disenumpart25.txt
+    BROWN (18, "Brown");
 
     private int value;
     private final String description;
@@ -182,8 +101,6 @@ public enum MinefieldPaintSchemePaintScheme
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypes.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypes.java
index 79961a8a6c02476be8d5f773ab1e452a874ed4c7..cb1823053caf7af1e630d6604f84b5e03cafc168 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypes.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypes.java
@@ -7,64 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 193,
- * marshal size 4,
+ * Generated from XML, <br>
+ * UID 193 marshal size 4<br>
  * MinefieldSensorTypes
  */
 public enum MinefieldSensorTypes 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** MinefieldSensorTypesOptical */// autogenerated using string template disenumpart21.txt
-
-    OPTICAL_2 (1, "Optical"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** MinefieldSensorTypesFLIR */// autogenerated using string template disenumpart21.txt
-
-    FLIR_2 (2, "FLIR"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** MinefieldSensorTypesRADAR */// autogenerated using string template disenumpart21.txt
-
-    RADAR_2 (3, "RADAR"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** MinefieldSensorTypesMagnetic */// autogenerated using string template disenumpart21.txt
-
-    MAGNETIC_2 (4, "Magnetic"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** MinefieldSensorTypesLaser */// autogenerated using string template disenumpart21.txt
-
-    LASER_2 (5, "Laser"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** MinefieldSensorTypesSONAR */// autogenerated using string template disenumpart21.txt
-
-    SONAR_2 (6, "SONAR"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** MinefieldSensorTypesPhysical */// autogenerated using string template disenumpart21.txt
-
-    PHYSICAL_2 (7, "Physical"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** MinefieldSensorTypesMultispectral */// autogenerated using string template disenumpart21.txt
-
-    MULTISPECTRAL_2 (8, "Multispectral"),;
-
-// autogenerated using string template disenumpart25.txt
+    /** MinefieldSensorTypesOptical */    OPTICAL_2 (1, "Optical"),
+    /** MinefieldSensorTypesFLIR */    FLIR_2 (2, "FLIR"),
+    /** MinefieldSensorTypesRADAR */    RADAR_2 (3, "RADAR"),
+    /** MinefieldSensorTypesMagnetic */    MAGNETIC_2 (4, "Magnetic"),
+    /** MinefieldSensorTypesLaser */    LASER_2 (5, "Laser"),
+    /** MinefieldSensorTypesSONAR */    SONAR_2 (6, "SONAR"),
+    /** MinefieldSensorTypesPhysical */    PHYSICAL_2 (7, "Physical"),
+    /** MinefieldSensorTypesMultispectral */    MULTISPECTRAL_2 (8, "Multispectral");
 
     private int value;
     private final String description;
@@ -114,8 +73,6 @@ public enum MinefieldSensorTypes
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateProtocolMode.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateProtocolMode.java
index 890e080918140a66e6d26fef2df90436a207cf1a..d664ef96779fed276ef9a098c1ae3fa88830aa94 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateProtocolMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateProtocolMode.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 336,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 336 marshal size 2<br>
  * MinefieldStateProtocolMode
  */
 public enum MinefieldStateProtocolMode 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Heartbeat Mode */
-// autogenerated using string template disenumpart2.txt
-
     HEARTBEAT_MODE (0, "Heartbeat Mode"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** QRP Mode */
-// autogenerated using string template disenumpart2.txt
-
-    QRP_MODE (1, "QRP Mode"),;
-
-// autogenerated using string template disenumpart25.txt
+    QRP_MODE (1, "QRP Mode");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum MinefieldStateProtocolMode
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5IFFMission.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5IFFMission.java
index 4ae8d9e6e241a2ebcfe92f9b984661edf6ecea36..e11d6bc9581f69eae723706019cb63682bb450e2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5IFFMission.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5IFFMission.java
@@ -7,60 +7,27 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 346,
- * marshal size 3,
+ * Generated from XML, <br>
+ * UID 346 marshal size 3<br>
  * Mode5IFFMission
  */
 public enum Mode5IFFMission 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Surveillance SHORAD */
-// autogenerated using string template disenumpart2.txt
-
     SURVEILLANCE_SHORAD (1, "Surveillance SHORAD"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SHORAD associated with a Weapons System */
-// autogenerated using string template disenumpart2.txt
-
     SHORAD_ASSOCIATED_WITH_A_WEAPONS_SYSTEM (2, "SHORAD associated with a Weapons System"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Weapon System */
-// autogenerated using string template disenumpart2.txt
-
     WEAPON_SYSTEM (3, "Weapon System"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Airborne and Surface (Ship) Surveillance Platforms */
-// autogenerated using string template disenumpart2.txt
-
     AIRBORNE_AND_SURFACE_SHIP_SURVEILLANCE_PLATFORMS (4, "Airborne and Surface (Ship) Surveillance Platforms"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Airborne and Surface (Ship) Weapons Platforms */
-// autogenerated using string template disenumpart2.txt
-
     AIRBORNE_AND_SURFACE_SHIP_WEAPONS_PLATFORMS (5, "Airborne and Surface (Ship) Weapons Platforms"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ground-to-Ground */
-// autogenerated using string template disenumpart2.txt
-
-    GROUND_TO_GROUND (6, "Ground-to-Ground"),;
-
-// autogenerated using string template disenumpart25.txt
+    GROUND_TO_GROUND (6, "Ground-to-Ground");
 
     private int value;
     private final String description;
@@ -110,8 +77,6 @@ public enum Mode5IFFMission
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5LevelSelection.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LevelSelection.java
index 52ae93651158669a2925b176fd59c2b96fd2ad53..2a418344129a21b5eaeea48dd0ad613a0010bb69 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5LevelSelection.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LevelSelection.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 412,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 412 marshal size 1<br>
  * Mode5LevelSelection
  */
 public enum Mode5LevelSelection 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mode 5 Level 1 */
-// autogenerated using string template disenumpart2.txt
-
     MODE_5_LEVEL_1 (0, "Mode 5 Level 1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mode 5 Level 2 */
-// autogenerated using string template disenumpart2.txt
-
-    MODE_5_LEVEL_2 (1, "Mode 5 Level 2"),;
-
-// autogenerated using string template disenumpart25.txt
+    MODE_5_LEVEL_2 (1, "Mode 5 Level 2");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum Mode5LevelSelection
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5LocationErrors.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LocationErrors.java
index 69a25f018c9bf30edf358a36c5f737ad1629314b..d2eb07e28ce61a8770f0ae20567bb9b8caf42b6d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5LocationErrors.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LocationErrors.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 423,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 423 marshal size 1<br>
  * Mode5LocationErrors
  */
 public enum Mode5LocationErrors 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Location Errors */
-// autogenerated using string template disenumpart2.txt
-
     NO_LOCATION_ERRORS (0, "No Location Errors"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** IFF Data Record Present */
-// autogenerated using string template disenumpart2.txt
-
-    IFF_DATA_RECORD_PRESENT (1, "IFF Data Record Present"),;
-
-// autogenerated using string template disenumpart25.txt
+    IFF_DATA_RECORD_PRESENT (1, "IFF Data Record Present");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum Mode5LocationErrors
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5MessageFormatsStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5MessageFormatsStatus.java
index 354ee3187d6b479d0227acbfa796b55bbd7fa9df..a7c01e2a38761704ce2dfdac5208cefff671c3ae 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5MessageFormatsStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5MessageFormatsStatus.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 380,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 380 marshal size 1<br>
  * Mode5MessageFormatsStatus
  */
 public enum Mode5MessageFormatsStatus 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Capability */
-// autogenerated using string template disenumpart2.txt
-
     CAPABILITY (0, "Capability"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Active Interrogation */
-// autogenerated using string template disenumpart2.txt
-
-    ACTIVE_INTERROGATION (1, "Active Interrogation"),;
-
-// autogenerated using string template disenumpart25.txt
+    ACTIVE_INTERROGATION (1, "Active Interrogation");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum Mode5MessageFormatsStatus
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5PlatformType.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5PlatformType.java
index 10ad7252fcdf4856c3a08aa78d474dc30fc13735..21fbbb7b4cb17c9501a0d219a654800bc2d757ad 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5PlatformType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5PlatformType.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 396,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 396 marshal size 1<br>
  * Mode5PlatformType
  */
 public enum Mode5PlatformType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ground Vehicle */
-// autogenerated using string template disenumpart2.txt
-
     GROUND_VEHICLE (0, "Ground Vehicle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Air Vehicle */
-// autogenerated using string template disenumpart2.txt
-
-    AIR_VEHICLE (1, "Air Vehicle"),;
-
-// autogenerated using string template disenumpart25.txt
+    AIR_VEHICLE (1, "Air Vehicle");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum Mode5PlatformType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5Reply.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5Reply.java
index 32e9dbf04fba74301ccce7e77c3e40c4dfe6cd1b..6de55afad04b8f3efbc4df0b2d56a098e2a11ff2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5Reply.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5Reply.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 350,
- * marshal size 3,
+ * Generated from XML, <br>
+ * UID 350 marshal size 3<br>
  * Mode5Reply
  */
 public enum Mode5Reply 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Response */
-// autogenerated using string template disenumpart2.txt
-
     NO_RESPONSE (0, "No Response"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Valid */
-// autogenerated using string template disenumpart2.txt
-
     VALID (1, "Valid"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Invalid */
-// autogenerated using string template disenumpart2.txt
-
     INVALID (2, "Invalid"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Unable to Verify */
-// autogenerated using string template disenumpart2.txt
-
-    UNABLE_TO_VERIFY (3, "Unable to Verify"),;
-
-// autogenerated using string template disenumpart25.txt
+    UNABLE_TO_VERIFY (3, "Unable to Verify");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum Mode5Reply
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5SAltitudeResolution.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SAltitudeResolution.java
index a934d42ef66956ad62ebfaea7c70156e60f4c792..74b4f1ad4f4e2af4d7cffd37b104de5d74a6bb02 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5SAltitudeResolution.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SAltitudeResolution.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 361,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 361 marshal size 1<br>
  * Mode5SAltitudeResolution
  */
 public enum Mode5SAltitudeResolution 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 100-foot */
-// autogenerated using string template disenumpart2.txt
-
     _100_FOOT (0, "100-foot"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 25-foot */
-// autogenerated using string template disenumpart2.txt
-
-    _25_FOOT (1, "25-foot"),;
-
-// autogenerated using string template disenumpart25.txt
+    _25_FOOT (1, "25-foot");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum Mode5SAltitudeResolution
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5SquitterType.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SquitterType.java
index 5c89159a0549b97fe4ffa6c7412a9882b7f7b734..c34daff6dc4e913338062a4988800ffd6a0ebdc3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5SquitterType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SquitterType.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 352,
- * marshal size 3,
+ * Generated from XML, <br>
+ * UID 352 marshal size 3<br>
  * Mode5SquitterType
  */
 public enum Mode5SquitterType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Capable */
-// autogenerated using string template disenumpart2.txt
-
     NOT_CAPABLE (0, "Not Capable"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Short */
-// autogenerated using string template disenumpart2.txt
-
     SHORT (1, "Short"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Extended */
-// autogenerated using string template disenumpart2.txt
-
-    EXTENDED (2, "Extended"),;
-
-// autogenerated using string template disenumpart25.txt
+    EXTENDED (2, "Extended");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum Mode5SquitterType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeCAltitudeIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeCAltitudeIndicator.java
index 2e6bc8c969440b4658add2c5322e967a9f317d65..5dc1091146920ce8af01c46e59ce700cb5da67cc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeCAltitudeIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeCAltitudeIndicator.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 340,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 340 marshal size 1<br>
  * ModeCAltitudeIndicator
  */
 public enum ModeCAltitudeIndicator 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Positive Altitude Above MSL */
-// autogenerated using string template disenumpart2.txt
-
     POSITIVE_ALTITUDE_ABOVE_MSL (0, "Positive Altitude Above MSL"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Negative Altitude Below MSL/Use Alternate Mode C Altitude */
-// autogenerated using string template disenumpart2.txt
-
-    NEGATIVE_ALTITUDE_BELOW_MSL_USE_ALTERNATE_MODE_C_ALTITUDE (1, "Negative Altitude Below MSL/Use Alternate Mode C Altitude"),;
-
-// autogenerated using string template disenumpart25.txt
+    NEGATIVE_ALTITUDE_BELOW_MSL_USE_ALTERNATE_MODE_C_ALTITUDE (1, "Negative Altitude Below MSL/Use Alternate Mode C Altitude");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum ModeCAltitudeIndicator
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorIdentifierICType.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorIdentifierICType.java
index 11b8a8c80c6c93d5dd27e98d34db5016cdb27d9d..7f60f2f10f2c8ff2de278b06b52dbe1973e2c8b2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorIdentifierICType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorIdentifierICType.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 348,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 348 marshal size 1<br>
  * ModeSInterrogatorIdentifierICType
  */
 public enum ModeSInterrogatorIdentifierICType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** II */
-// autogenerated using string template disenumpart2.txt
-
     II (0, "II"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SI */
-// autogenerated using string template disenumpart2.txt
-
-    SI (1, "SI"),;
-
-// autogenerated using string template disenumpart25.txt
+    SI (1, "SI");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum ModeSInterrogatorIdentifierICType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorStatusTransmitState.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorStatusTransmitState.java
index 5c2696e73b05035df35323714c9242895b20c111..28d4b13116b9cdbc494e89af6e7f8e4c44545f05 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorStatusTransmitState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorStatusTransmitState.java
@@ -7,54 +7,25 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 347,
- * marshal size 3,
+ * Generated from XML, <br>
+ * UID 347 marshal size 3<br>
  * ModeSInterrogatorStatusTransmitState
  */
 public enum ModeSInterrogatorStatusTransmitState 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Roll-Call */
-// autogenerated using string template disenumpart2.txt
-
     ROLL_CALL (1, "Roll-Call"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** All Call */
-// autogenerated using string template disenumpart2.txt
-
     ALL_CALL (2, "All Call"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Lockout Override */
-// autogenerated using string template disenumpart2.txt
-
     LOCKOUT_OVERRIDE (3, "Lockout Override"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Temporary Lockout */
-// autogenerated using string template disenumpart2.txt
-
     TEMPORARY_LOCKOUT (4, "Temporary Lockout"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Intermittent Lockout */
-// autogenerated using string template disenumpart2.txt
-
-    INTERMITTENT_LOCKOUT (5, "Intermittent Lockout"),;
-
-// autogenerated using string template disenumpart25.txt
+    INTERMITTENT_LOCKOUT (5, "Intermittent Lockout");
 
     private int value;
     private final String description;
@@ -104,8 +75,6 @@ public enum ModeSInterrogatorStatusTransmitState
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterRecordSource.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterRecordSource.java
index 857aed339711acce7d20eee73fc717eba288292d..93f45884a072ae36bd4837e791cdf85274542f82 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterRecordSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterRecordSource.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 355,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 355 marshal size 1<br>
  * ModeSSquitterRecordSource
  */
 public enum ModeSSquitterRecordSource 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Layer 4 IFF Data Records */
-// autogenerated using string template disenumpart2.txt
-
     LAYER_4_IFF_DATA_RECORDS (0, "Layer 4 IFF Data Records"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Layer 5 GICB IFF Data Records */
-// autogenerated using string template disenumpart2.txt
-
-    LAYER_5_GICB_IFF_DATA_RECORDS (1, "Layer 5 GICB IFF Data Records"),;
-
-// autogenerated using string template disenumpart25.txt
+    LAYER_5_GICB_IFF_DATA_RECORDS (1, "Layer 5 GICB IFF Data Records");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum ModeSSquitterRecordSource
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterType.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterType.java
index bef9ee3f1bb3e656843114f1ab178a29ce091188..5e86961454f357efdea5825a0565eaad32b3bd4f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterType.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 354,
- * marshal size 3,
+ * Generated from XML, <br>
+ * UID 354 marshal size 3<br>
  * ModeSSquitterType
  */
 public enum ModeSSquitterType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Capable */
-// autogenerated using string template disenumpart2.txt
-
     NOT_CAPABLE (0, "Not Capable"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Acquisition */
-// autogenerated using string template disenumpart2.txt
-
     ACQUISITION (1, "Acquisition"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Extended */
-// autogenerated using string template disenumpart2.txt
-
     EXTENDED (2, "Extended"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Short */
-// autogenerated using string template disenumpart2.txt
-
-    SHORT (3, "Short"),;
-
-// autogenerated using string template disenumpart25.txt
+    SHORT (3, "Short");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum ModeSSquitterType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionCategory.java
index 368c27330b67e462202641cd4556cec67d3c2e34..cc9c6a26402aa7266093bd8b53d16502e8f7a800 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionCategory.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 15,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 15 marshal size 8<br>
  * MunitionCategory
  */
 public enum MunitionCategory implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Guided */
-// autogenerated using string template disenumpart2.txt
-
     GUIDED (1, "Guided"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ballistic */
-// autogenerated using string template disenumpart2.txt
-
     BALLISTIC (2, "Ballistic"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fixed */
-// autogenerated using string template disenumpart2.txt
-
-    FIXED (3, "Fixed"),;
-
-// autogenerated using string template disenumpart25.txt
+    FIXED (3, "Fixed");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum MunitionCategory implements Category
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDomain.java
index d80ad80ba472a41a63a3a8633413980720851313..bae7fba55def9b5acc7019f2c97e3fc0948f4274 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDomain.java
@@ -7,96 +7,39 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 14,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 14 marshal size 8<br>
  * MunitionDomain
  */
 public enum MunitionDomain 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Anti-Air */
-// autogenerated using string template disenumpart2.txt
-
     ANTI_AIR (1, "Anti-Air"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Anti-Armor */
-// autogenerated using string template disenumpart2.txt
-
     ANTI_ARMOR (2, "Anti-Armor"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Anti-Guided Weapon */
-// autogenerated using string template disenumpart2.txt
-
     ANTI_GUIDED_WEAPON (3, "Anti-Guided Weapon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Anti-Radar */
-// autogenerated using string template disenumpart2.txt
-
     ANTI_RADAR (4, "Anti-Radar"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Anti-Satellite */
-// autogenerated using string template disenumpart2.txt
-
     ANTI_SATELLITE (5, "Anti-Satellite"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Anti-Ship */
-// autogenerated using string template disenumpart2.txt
-
     ANTI_SHIP (6, "Anti-Ship"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Anti-Submarine */
-// autogenerated using string template disenumpart2.txt
-
     ANTI_SUBMARINE (7, "Anti-Submarine"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Anti-Personnel */
-// autogenerated using string template disenumpart2.txt
-
     ANTI_PERSONNEL (8, "Anti-Personnel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Battlefield Support */
-// autogenerated using string template disenumpart2.txt
-
     BATTLEFIELD_SUPPORT (9, "Battlefield Support"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Strategic */
-// autogenerated using string template disenumpart2.txt
-
     STRATEGIC (10, "Strategic"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tactical */
-// autogenerated using string template disenumpart2.txt
-
     TACTICAL (11, "Tactical"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Directed Energy (DE) Weapon */
-// autogenerated using string template disenumpart2.txt
-
-    DIRECTED_ENERGY_DE_WEAPON (12, "Directed Energy (DE) Weapon"),;
-
-// autogenerated using string template disenumpart25.txt
+    DIRECTED_ENERGY_DE_WEAPON (12, "Directed Energy (DE) Weapon");
 
     private int value;
     private final String description;
@@ -146,8 +89,6 @@ public enum MunitionDomain
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionExpendableStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionExpendableStatus.java
index 9ac16847253093a32c535b8340112a01f6c54325..87043c5cad7776816ca61bdb2ccc2e4724491429 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionExpendableStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionExpendableStatus.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 327,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 327 marshal size 8<br>
  * MunitionExpendableStatus
  */
 public enum MunitionExpendableStatus 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ready */
-// autogenerated using string template disenumpart2.txt
-
     READY (1, "Ready"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Inventory */
-// autogenerated using string template disenumpart2.txt
-
-    INVENTORY (2, "Inventory"),;
-
-// autogenerated using string template disenumpart25.txt
+    INVENTORY (2, "Inventory");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum MunitionExpendableStatus
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordFrequencyTable.java b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordFrequencyTable.java
index 39dc98b957ef2f1f56df5b54a0e34cb560434014..f7455f030492d130ffb37cc32ed7ca211d32d3b9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordFrequencyTable.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordFrequencyTable.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 299,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 299 marshal size 2<br>
  * NETIDRecordFrequencyTable
  */
 public enum NETIDRecordFrequencyTable 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** HQ I Operations */
-// autogenerated using string template disenumpart2.txt
-
     HQ_I_OPERATIONS (0, "HQ I Operations"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** All HQII, HQIIA FM - NATO/Europe Area Operations */
-// autogenerated using string template disenumpart2.txt
-
     ALL_HQII_HQIIA_FM_NATO_EUROPE_AREA_OPERATIONS (1, "All HQII, HQIIA FM - NATO/Europe Area Operations"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** All HQII, HQIIA FM - Non-NATO/Europe Operations */
-// autogenerated using string template disenumpart2.txt
-
     ALL_HQII_HQIIA_FM_NON_NATO_EUROPE_OPERATIONS (2, "All HQII, HQIIA FM - Non-NATO/Europe Operations"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** HQIIA (SATURN) */
-// autogenerated using string template disenumpart2.txt
-
-    HQIIA_SATURN (3, "HQIIA (SATURN)"),;
-
-// autogenerated using string template disenumpart25.txt
+    HQIIA_SATURN (3, "HQIIA (SATURN)");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum NETIDRecordFrequencyTable
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordMode.java b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordMode.java
index e47e8004a678f39054028b1b0c6e026dbad4fe2e..21aa17e350ab37189ca880f4d24aaf4090b0788a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordMode.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 298,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 298 marshal size 2<br>
  * NETIDRecordMode
  */
 public enum NETIDRecordMode 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** A - HAVE QUICK I or HAVE QUICK II COMBAT */
-// autogenerated using string template disenumpart2.txt
-
     A_HAVE_QUICK_I_OR_HAVE_QUICK_II_COMBAT (1, "A - HAVE QUICK I or HAVE QUICK II COMBAT"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** B - HAVE QUICK IIA (SATURN) COMBAT */
-// autogenerated using string template disenumpart2.txt
-
     B_HAVE_QUICK_IIA_SATURN_COMBAT (2, "B - HAVE QUICK IIA (SATURN) COMBAT"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** T - TRAINING */
-// autogenerated using string template disenumpart2.txt
-
-    T_TRAINING (3, "T - TRAINING"),;
-
-// autogenerated using string template disenumpart25.txt
+    T_TRAINING (3, "T - TRAINING");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum NETIDRecordMode
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/NavigationSource.java b/src-generated/edu/nps/moves/dis7/enumerations/NavigationSource.java
index 704043236cc7245951964ecc0218112912cd457b..f507449fc46f1ef68456ef894d43c3e2b96b092e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/NavigationSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/NavigationSource.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 359,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 359 marshal size 8<br>
  * NavigationSource
  */
 public enum NavigationSource 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** GPS */
-// autogenerated using string template disenumpart2.txt
-
     GPS (1, "GPS"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** INS */
-// autogenerated using string template disenumpart2.txt
-
     INS (2, "INS"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** INS/GPS */
-// autogenerated using string template disenumpart2.txt
-
-    INS_GPS (3, "INS/GPS"),;
-
-// autogenerated using string template disenumpart25.txt
+    INS_GPS (3, "INS/GPS");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum NavigationSource
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ObjectKind.java b/src-generated/edu/nps/moves/dis7/enumerations/ObjectKind.java
index a9950ebfe224c496d6c760d59eefb49578f67e70..85155fd476f35129dd5bb0dfdcf993b3a22f94c6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ObjectKind.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ObjectKind.java
@@ -7,72 +7,31 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 225,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 225 marshal size 8<br>
  * ObjectKind
  */
 public enum ObjectKind 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Obstacle */
-// autogenerated using string template disenumpart2.txt
-
     OBSTACLE (1, "Obstacle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Prepared Position */
-// autogenerated using string template disenumpart2.txt
-
     PREPARED_POSITION (2, "Prepared Position"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cultural Feature */
-// autogenerated using string template disenumpart2.txt
-
     CULTURAL_FEATURE (3, "Cultural Feature"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Passageway */
-// autogenerated using string template disenumpart2.txt
-
     PASSAGEWAY (4, "Passageway"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tactical Smoke */
-// autogenerated using string template disenumpart2.txt
-
     TACTICAL_SMOKE (5, "Tactical Smoke"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Obstacle Marker */
-// autogenerated using string template disenumpart2.txt
-
     OBSTACLE_MARKER (6, "Obstacle Marker"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Obstacle Breach */
-// autogenerated using string template disenumpart2.txt
-
     OBSTACLE_BREACH (7, "Obstacle Breach"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Environmental Object */
-// autogenerated using string template disenumpart2.txt
-
-    ENVIRONMENTAL_OBJECT (8, "Environmental Object"),;
-
-// autogenerated using string template disenumpart25.txt
+    ENVIRONMENTAL_OBJECT (8, "Environmental Object");
 
     private int value;
     private final String description;
@@ -122,8 +81,6 @@ public enum ObjectKind
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/OwnershipStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/OwnershipStatus.java
index d95b28abf60a6145282f015955c8750d114f1450..0f6886c936c1c0d8a6a641b6c8bbcc3cef83e5a6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/OwnershipStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/OwnershipStatus.java
@@ -7,60 +7,27 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 332,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 332 marshal size 8<br>
  * OwnershipStatus
  */
 public enum OwnershipStatus 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** New Owner */
-// autogenerated using string template disenumpart2.txt
-
     NEW_OWNER (1, "New Owner"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ownership Query Response */
-// autogenerated using string template disenumpart2.txt
-
     OWNERSHIP_QUERY_RESPONSE (2, "Ownership Query Response"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ownership Conflict */
-// autogenerated using string template disenumpart2.txt
-
     OWNERSHIP_CONFLICT (3, "Ownership Conflict"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Local Entity Cancelled - Auto Resolve Conflict */
-// autogenerated using string template disenumpart2.txt
-
     LOCAL_ENTITY_CANCELLED_AUTO_RESOLVE_CONFLICT (4, "Local Entity Cancelled - Auto Resolve Conflict"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Local Entity Cancelled - Manual Resolve Conflict */
-// autogenerated using string template disenumpart2.txt
-
     LOCAL_ENTITY_CANCELLED_MANUAL_RESOLVE_CONFLICT (5, "Local Entity Cancelled - Manual Resolve Conflict"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Local Entity Cancelled - Remove Entity TCR Received */
-// autogenerated using string template disenumpart2.txt
-
-    LOCAL_ENTITY_CANCELLED_REMOVE_ENTITY_TCR_RECEIVED (6, "Local Entity Cancelled - Remove Entity TCR Received"),;
-
-// autogenerated using string template disenumpart25.txt
+    LOCAL_ENTITY_CANCELLED_REMOVE_ENTITY_TCR_RECEIVED (6, "Local Entity Cancelled - Remove Entity TCR Received");
 
     private int value;
     private final String description;
@@ -110,8 +77,6 @@ public enum OwnershipStatus
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Parachute.java b/src-generated/edu/nps/moves/dis7/enumerations/Parachute.java
index 324992ab68c18c30b54a013a79459bc97a7032e0..b56d17fe0ca0f7d4fcae2c50d8840b76c6f82ae3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Parachute.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Parachute.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 401,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 401 marshal size 2<br>
  * Parachute
  */
 public enum Parachute 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** None */
-// autogenerated using string template disenumpart2.txt
-
     NONE (0, "None"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Deployed */
-// autogenerated using string template disenumpart2.txt
-
     DEPLOYED (1, "Deployed"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Collapsed */
-// autogenerated using string template disenumpart2.txt
-
     COLLAPSED (2, "Collapsed"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Malfunction/Streamer */
-// autogenerated using string template disenumpart2.txt
-
-    MALFUNCTION_STREAMER (3, "Malfunction/Streamer"),;
-
-// autogenerated using string template disenumpart25.txt
+    MALFUNCTION_STREAMER (3, "Malfunction/Streamer");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum Parachute
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PhysicalAssociationTypeGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/PhysicalAssociationTypeGroups.java
index 23f35db9127e8fcd5870725f9137b73458333e3a..d02213cb67f80bae5517c026cee68c8b617c8d72 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PhysicalAssociationTypeGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PhysicalAssociationTypeGroups.java
@@ -7,48 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 322,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 322 marshal size 8<br>
  * PhysicalAssociationTypeGroups
  */
 public enum PhysicalAssociationTypeGroups 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Specified */
-// autogenerated using string template disenumpart2.txt
-
     NOT_SPECIFIED (0, "Not Specified"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Towed / Mounted / Sling Load */
-// autogenerated using string template disenumpart2.txt
-
     TOWED_MOUNTED_SLING_LOAD (1, "Towed / Mounted / Sling Load"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Restrained */
-// autogenerated using string template disenumpart2.txt
-
     RESTRAINED (2, "Restrained"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mission */
-// autogenerated using string template disenumpart2.txt
-
     MISSION (3, "Mission"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other Connections */
-// autogenerated using string template disenumpart2.txt
-
-    OTHER_CONNECTIONS (4, "Other Connections"),;
-
-// autogenerated using string template disenumpart25.txt
+    OTHER_CONNECTIONS (4, "Other Connections");
 
     private int value;
     private final String description;
@@ -98,8 +73,6 @@ public enum PhysicalAssociationTypeGroups
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCategory.java
index a7e9c6ad9b8561aea490726980d03269f2126568..d6d9f641263d34a8fc8f1f85295a4ac3d80341ca 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCategory.java
@@ -7,203 +7,66 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 10,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 10 marshal size 8<br>
  * PlatformAirCategory
  */
 public enum PlatformAirCategory implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fighter/Air Defense */
-// autogenerated using string template disenumpart2.txt
-
     FIGHTER_AIR_DEFENSE (1, "Fighter/Air Defense"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Attack/Strike */
-// autogenerated using string template disenumpart2.txt
-
     ATTACK_STRIKE (2, "Attack/Strike"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bomber */
-// autogenerated using string template disenumpart2.txt
-
     BOMBER (3, "Bomber"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cargo/Tanker */
-// autogenerated using string template disenumpart2.txt
-
     CARGO_TANKER (4, "Cargo/Tanker"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** ASW/Patrol/Observation */
-// autogenerated using string template disenumpart2.txt
-
     ASW_PATROL_OBSERVATION (5, "ASW/Patrol/Observation"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Electronic Warfare (EW) */
-// autogenerated using string template disenumpart2.txt
-
     ELECTRONIC_WARFARE_EW (6, "Electronic Warfare (EW)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Reconnaissance */
-// autogenerated using string template disenumpart2.txt
-
     RECONNAISSANCE (7, "Reconnaissance"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Surveillance/C2 (Airborne Early Warning) */
-// autogenerated using string template disenumpart2.txt
-
     SURVEILLANCE_C2_AIRBORNE_EARLY_WARNING (8, "Surveillance/C2 (Airborne Early Warning)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Air-Sea Rescue (ASR) */
-// autogenerated using string template disenumpart2.txt
-
     AIR_SEA_RESCUE_ASR (9, "Air-Sea Rescue (ASR)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Attack Helicopter */
-// autogenerated using string template disenumpart2.txt
-
     ATTACK_HELICOPTER (20, "Attack Helicopter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Utility Helicopter */
-// autogenerated using string template disenumpart2.txt
-
     UTILITY_HELICOPTER (21, "Utility Helicopter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Anti-Submarine Warfare/Patrol Helicopter */
-// autogenerated using string template disenumpart2.txt
-
     ANTI_SUBMARINE_WARFARE_PATROL_HELICOPTER (22, "Anti-Submarine Warfare/Patrol Helicopter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cargo Helicopter */
-// autogenerated using string template disenumpart2.txt
-
     CARGO_HELICOPTER (23, "Cargo Helicopter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Observation Helicopter */
-// autogenerated using string template disenumpart2.txt
-
     OBSERVATION_HELICOPTER (24, "Observation Helicopter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Special Operations Helicopter */
-// autogenerated using string template disenumpart2.txt
-
     SPECIAL_OPERATIONS_HELICOPTER (25, "Special Operations Helicopter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trainer */
-// autogenerated using string template disenumpart2.txt
-
     TRAINER (40, "Trainer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Unmanned */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "Unmanned"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Non-Combatant Commercial Aircraft */
-// autogenerated using string template disenumpart2.txt
-
     ACTION_RESPONSE_RELIABLE (57, "Non-Combatant Commercial Aircraft"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories */// autogenerated using string template disenumpart21.txt
-
-    CIVILIAN_ULTRALIGHT_AIRCRAFT_NON_RIGID_WING_2 (80, "Civilian Ultralight Aircraft, Non-rigid Wing"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformAirCivilianUltralightRigidWingAircraftSubcategories */// autogenerated using string template disenumpart21.txt
-
-    CIVILIAN_ULTRALIGHT_AIRCRAFT_RIGID_WING_2 (81, "Civilian Ultralight Aircraft, Rigid Wing"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformAirCivilianGliderSubcategories */// autogenerated using string template disenumpart21.txt
-
-    CIVILIAN_FIXED_WING_AIRCRAFT_GLIDER_2 (83, "Civilian Fixed Wing Aircraft, Glider"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformAirCivilianFixedWingAircraftSubcategories */// autogenerated using string template disenumpart21.txt
-
-    CIVILIAN_FIXED_WING_AIRCRAFT_LIGHT_SPORT_UP_TO_1320_LBS_600_KG_2 (84, "Civilian Fixed Wing Aircraft, Light Sport (up to 1320 lbs / 600 kg)"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformAirCivilianFixedWingAircraftSubcategories */// autogenerated using string template disenumpart21.txt
-
-    CIVILIAN_FIXED_WING_AIRCRAFT_SMALL_UP_TO_12_500_LBS_5_670_KG_2 (85, "Civilian Fixed Wing Aircraft, Small (up to 12,500 lbs / 5,670 kg)"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformAirCivilianFixedWingAircraftSubcategories */// autogenerated using string template disenumpart21.txt
-
-    CIVILIAN_FIXED_WING_AIRCRAFT_MEDIUM_UP_TO_41_000_LBS_18_597_KG_2 (86, "Civilian Fixed Wing Aircraft, Medium (up to 41,000 lbs / 18,597 kg)"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformAirCivilianFixedWingAircraftSubcategories */// autogenerated using string template disenumpart21.txt
-
-    CIVILIAN_FIXED_WING_AIRCRAFT_LARGE_UP_TO_255_000_LBS_115_666_KG_2 (87, "Civilian Fixed Wing Aircraft, Large (up to 255,000 lbs / 115,666 kg)"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformAirCivilianFixedWingAircraftSubcategories */// autogenerated using string template disenumpart21.txt
-
-    CIVILIAN_FIXED_WING_AIRCRAFT_HEAVY_ABOVE_255_000_LBS_115_666_KG_2 (88, "Civilian Fixed Wing Aircraft, Heavy (above 255,000 lbs / 115,666 kg)"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformAirCivilianHelicopterSubcategories */// autogenerated using string template disenumpart21.txt
-
-    CIVILIAN_HELICOPTER_SMALL_UP_TO_7_000_LBS_3_175_KG_2 (90, "Civilian Helicopter, Small (up to 7,000 lbs / 3,175 kg)"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformAirCivilianHelicopterSubcategories */// autogenerated using string template disenumpart21.txt
-
-    CIVILIAN_HELICOPTER_MEDIUM_UP_TO_20_000_LBS_9_072_KG_2 (91, "Civilian Helicopter, Medium (up to 20,000 lbs / 9,072 kg)"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformAirCivilianHelicopterSubcategories */// autogenerated using string template disenumpart21.txt
-
-    CIVILIAN_HELICOPTER_LARGE_ABOVE_20_000_LBS_9_072_KG_2 (92, "Civilian Helicopter, Large (above 20,000 lbs / 9,072 kg)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
+    /** PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories */    CIVILIAN_ULTRALIGHT_AIRCRAFT_NON_RIGID_WING_2 (80, "Civilian Ultralight Aircraft, Non-rigid Wing"),
+    /** PlatformAirCivilianUltralightRigidWingAircraftSubcategories */    CIVILIAN_ULTRALIGHT_AIRCRAFT_RIGID_WING_2 (81, "Civilian Ultralight Aircraft, Rigid Wing"),
+    /** PlatformAirCivilianGliderSubcategories */    CIVILIAN_FIXED_WING_AIRCRAFT_GLIDER_2 (83, "Civilian Fixed Wing Aircraft, Glider"),
+    /** PlatformAirCivilianFixedWingAircraftSubcategories */    CIVILIAN_FIXED_WING_AIRCRAFT_LIGHT_SPORT_UP_TO_1320_LBS_600_KG_2 (84, "Civilian Fixed Wing Aircraft, Light Sport (up to 1320 lbs / 600 kg)"),
+    /** PlatformAirCivilianFixedWingAircraftSubcategories */    CIVILIAN_FIXED_WING_AIRCRAFT_SMALL_UP_TO_12_500_LBS_5_670_KG_2 (85, "Civilian Fixed Wing Aircraft, Small (up to 12,500 lbs / 5,670 kg)"),
+    /** PlatformAirCivilianFixedWingAircraftSubcategories */    CIVILIAN_FIXED_WING_AIRCRAFT_MEDIUM_UP_TO_41_000_LBS_18_597_KG_2 (86, "Civilian Fixed Wing Aircraft, Medium (up to 41,000 lbs / 18,597 kg)"),
+    /** PlatformAirCivilianFixedWingAircraftSubcategories */    CIVILIAN_FIXED_WING_AIRCRAFT_LARGE_UP_TO_255_000_LBS_115_666_KG_2 (87, "Civilian Fixed Wing Aircraft, Large (up to 255,000 lbs / 115,666 kg)"),
+    /** PlatformAirCivilianFixedWingAircraftSubcategories */    CIVILIAN_FIXED_WING_AIRCRAFT_HEAVY_ABOVE_255_000_LBS_115_666_KG_2 (88, "Civilian Fixed Wing Aircraft, Heavy (above 255,000 lbs / 115,666 kg)"),
+    /** PlatformAirCivilianHelicopterSubcategories */    CIVILIAN_HELICOPTER_SMALL_UP_TO_7_000_LBS_3_175_KG_2 (90, "Civilian Helicopter, Small (up to 7,000 lbs / 3,175 kg)"),
+    /** PlatformAirCivilianHelicopterSubcategories */    CIVILIAN_HELICOPTER_MEDIUM_UP_TO_20_000_LBS_9_072_KG_2 (91, "Civilian Helicopter, Medium (up to 20,000 lbs / 9,072 kg)"),
+    /** PlatformAirCivilianHelicopterSubcategories */    CIVILIAN_HELICOPTER_LARGE_ABOVE_20_000_LBS_9_072_KG_2 (92, "Civilian Helicopter, Large (above 20,000 lbs / 9,072 kg)"),
     /** Civilian Autogyro */
-// autogenerated using string template disenumpart2.txt
-
     CIVILIAN_AUTOGYRO (93, "Civilian Autogyro"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformAirCivilianLighterthanAirBalloonSubcategories */// autogenerated using string template disenumpart21.txt
-
-    CIVILIAN_LIGHTER_THAN_AIR_BALLOON_2 (100, "Civilian Lighter than Air, Balloon"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformAirCivilianLighterthanAirAirshipSubcategories */// autogenerated using string template disenumpart21.txt
-
-    CIVILIAN_LIGHTER_THAN_AIR_AIRSHIP_2 (101, "Civilian Lighter than Air, Airship"),;
-
-// autogenerated using string template disenumpart25.txt
+    /** PlatformAirCivilianLighterthanAirBalloonSubcategories */    CIVILIAN_LIGHTER_THAN_AIR_BALLOON_2 (100, "Civilian Lighter than Air, Balloon"),
+    /** PlatformAirCivilianLighterthanAirAirshipSubcategories */    CIVILIAN_LIGHTER_THAN_AIR_AIRSHIP_2 (101, "Civilian Lighter than Air, Airship");
 
     private int value;
     private final String description;
@@ -253,8 +116,6 @@ public enum PlatformAirCategory implements Category
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java
index dc583db4a1ef5c05c96dbfcc7b5c7082e4fccd09..7b87002551f3f2c009b045916d820c06864020b5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java
@@ -7,67 +7,31 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 277, marshal size 8,
- * PlatformAirCivilianFixedWingAircraftSubcategories
+ * Generated from XML, <br>
+ * UID 277 marshal size 8<br>
+ * PlatformAirCivilianFixedWingAircraftSubcategories<br>
  * Subcategories for Air Platform Categories 84-88. Subcategory values have the type of engine in the 10s digit and the number of engines in the 1s digit.
  */
 public enum PlatformAirCivilianFixedWingAircraftSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Single Piston Engine */
-// autogenerated using string template disenumpart2.txt
-
     SINGLE_PISTON_ENGINE (11, "Single Piston Engine"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Twin Piston Engine */
-// autogenerated using string template disenumpart2.txt
-
     TWIN_PISTON_ENGINE (12, "Twin Piston Engine"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Single Engine Turboprop */
-// autogenerated using string template disenumpart2.txt
-
     SINGLE_ENGINE_TURBOPROP (21, "Single Engine Turboprop"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Twin Engine Turboprop */
-// autogenerated using string template disenumpart2.txt
-
     TWIN_ENGINE_TURBOPROP (22, "Twin Engine Turboprop"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Four Engine Turboprop */
-// autogenerated using string template disenumpart2.txt
-
     FOUR_ENGINE_TURBOPROP (24, "Four Engine Turboprop"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Twin Jet */
-// autogenerated using string template disenumpart2.txt
-
     TWIN_JET (32, "Twin Jet"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tri Jet */
-// autogenerated using string template disenumpart2.txt
-
     TRI_JET (33, "Tri Jet"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Four Engine Jet */
-// autogenerated using string template disenumpart2.txt
-
-    FOUR_ENGINE_JET (34, "Four Engine Jet"),;
-
-// autogenerated using string template disenumpart25.txt
+    FOUR_ENGINE_JET (34, "Four Engine Jet");
 
     private int value;
     private final String description;
@@ -117,8 +81,6 @@ public enum PlatformAirCivilianFixedWingAircraftSubcategories implements SubCate
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianGliderSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianGliderSubcategories.java
index fbefa792e1e913464379317ac011d57471c1593a..1cf963524f95a814a702154b7756cee89b225b01 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianGliderSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianGliderSubcategories.java
@@ -7,31 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 276, marshal size 8,
- * PlatformAirCivilianGliderSubcategories
+ * Generated from XML, <br>
+ * UID 276 marshal size 8<br>
+ * PlatformAirCivilianGliderSubcategories<br>
  * Subcategories for Air Platform Category 83
  */
 public enum PlatformAirCivilianGliderSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sail Plane */
-// autogenerated using string template disenumpart2.txt
-
     SAIL_PLANE (1, "Sail Plane"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Motor Glider */
-// autogenerated using string template disenumpart2.txt
-
-    MOTOR_GLIDER (2, "Motor Glider"),;
-
-// autogenerated using string template disenumpart25.txt
+    MOTOR_GLIDER (2, "Motor Glider");
 
     private int value;
     private final String description;
@@ -81,8 +69,6 @@ public enum PlatformAirCivilianGliderSubcategories implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianHelicopterSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianHelicopterSubcategories.java
index c2a726ea1ce0ad2dd05e279226d965ef93f5be51..a4fe4360079080be08a930d20170134ae42fb2a1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianHelicopterSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianHelicopterSubcategories.java
@@ -7,61 +7,29 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 278, marshal size 8,
- * PlatformAirCivilianHelicopterSubcategories
+ * Generated from XML, <br>
+ * UID 278 marshal size 8<br>
+ * PlatformAirCivilianHelicopterSubcategories<br>
  * Subcategories for Air Platform Categories 90-92. Subcategory values have the number of rotors in the 10s digit and the rotor configuration in the 1s digit.
  */
 public enum PlatformAirCivilianHelicopterSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Single Rotor, Piston Engine */
-// autogenerated using string template disenumpart2.txt
-
     SINGLE_ROTOR_PISTON_ENGINE (11, "Single Rotor, Piston Engine"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Single Rotor, Turboshaft Engine, Conventional Tail Rotor */
-// autogenerated using string template disenumpart2.txt
-
     SINGLE_ROTOR_TURBOSHAFT_ENGINE_CONVENTIONAL_TAIL_ROTOR (12, "Single Rotor, Turboshaft Engine, Conventional Tail Rotor"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Single Rotor, Turboshaft Engine, Shrouded Tail Rotor */
-// autogenerated using string template disenumpart2.txt
-
     SINGLE_ROTOR_TURBOSHAFT_ENGINE_SHROUDED_TAIL_ROTOR (13, "Single Rotor, Turboshaft Engine, Shrouded Tail Rotor"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Single Rotor, Turboshaft Engine, No Tail Rotor */
-// autogenerated using string template disenumpart2.txt
-
     SINGLE_ROTOR_TURBOSHAFT_ENGINE_NO_TAIL_ROTOR (14, "Single Rotor, Turboshaft Engine, No Tail Rotor"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tandem Rotor */
-// autogenerated using string template disenumpart2.txt
-
     TANDEM_ROTOR (21, "Tandem Rotor"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Coaxial Rotor */
-// autogenerated using string template disenumpart2.txt
-
     COAXIAL_ROTOR (22, "Coaxial Rotor"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Intermeshing Rotor */
-// autogenerated using string template disenumpart2.txt
-
-    INTERMESHING_ROTOR (23, "Intermeshing Rotor"),;
-
-// autogenerated using string template disenumpart25.txt
+    INTERMESHING_ROTOR (23, "Intermeshing Rotor");
 
     private int value;
     private final String description;
@@ -111,8 +79,6 @@ public enum PlatformAirCivilianHelicopterSubcategories implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java
index 166955d57fd837fc4f640adce5bb8b96aacf7917..6d3cd28e270500f13b66224e94557c66b24bc15d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java
@@ -7,43 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 280, marshal size 8,
- * PlatformAirCivilianLighterthanAirAirshipSubcategories
+ * Generated from XML, <br>
+ * UID 280 marshal size 8<br>
+ * PlatformAirCivilianLighterthanAirAirshipSubcategories<br>
  * Subcategories for Air Platform Category 101
  */
 public enum PlatformAirCivilianLighterthanAirAirshipSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Non-rigid (blimp) */
-// autogenerated using string template disenumpart2.txt
-
     NON_RIGID_BLIMP (1, "Non-rigid (blimp)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Semi-rigid */
-// autogenerated using string template disenumpart2.txt
-
     SEMI_RIGID (2, "Semi-rigid"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Rigid */
-// autogenerated using string template disenumpart2.txt
-
     RIGID (3, "Rigid"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hybrid */
-// autogenerated using string template disenumpart2.txt
-
-    HYBRID (4, "Hybrid"),;
-
-// autogenerated using string template disenumpart25.txt
+    HYBRID (4, "Hybrid");
 
     private int value;
     private final String description;
@@ -93,8 +73,6 @@ public enum PlatformAirCivilianLighterthanAirAirshipSubcategories implements Sub
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java
index 0c372cec89441d87c0cdbf9eadcc62f721d4d98a..4e1f4f600055d73a60064e30b93f1c5ebecc05ca 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java
@@ -7,49 +7,25 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 279, marshal size 8,
- * PlatformAirCivilianLighterthanAirBalloonSubcategories
+ * Generated from XML, <br>
+ * UID 279 marshal size 8<br>
+ * PlatformAirCivilianLighterthanAirBalloonSubcategories<br>
  * Subcategories for Air Platform Category 100
  */
 public enum PlatformAirCivilianLighterthanAirBalloonSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Gas-filled, free */
-// autogenerated using string template disenumpart2.txt
-
     GAS_FILLED_FREE (1, "Gas-filled, free"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Gas-filled, tethered */
-// autogenerated using string template disenumpart2.txt
-
     GAS_FILLED_TETHERED (2, "Gas-filled, tethered"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hot Air */
-// autogenerated using string template disenumpart2.txt
-
     HOT_AIR (3, "Hot Air"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Roziere Balloon */
-// autogenerated using string template disenumpart2.txt
-
     ROZIERE_BALLOON (4, "Roziere Balloon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Helikite */
-// autogenerated using string template disenumpart2.txt
-
-    HELIKITE (5, "Helikite"),;
-
-// autogenerated using string template disenumpart25.txt
+    HELIKITE (5, "Helikite");
 
     private int value;
     private final String description;
@@ -99,8 +75,6 @@ public enum PlatformAirCivilianLighterthanAirBalloonSubcategories implements Sub
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java
index 7808be94b50683555fc2134e0888854b291ec843..316d2d74953146c3c68d9e67ca2bcac5c694118a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java
@@ -7,49 +7,25 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 274, marshal size 8,
- * PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories
+ * Generated from XML, <br>
+ * UID 274 marshal size 8<br>
+ * PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories<br>
  * Subcategories for Air Platform Category 80
  */
 public enum PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hang Glider, Unpowered */
-// autogenerated using string template disenumpart2.txt
-
     HANG_GLIDER_UNPOWERED (1, "Hang Glider, Unpowered"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hang Glider, Powered */
-// autogenerated using string template disenumpart2.txt
-
     HANG_GLIDER_POWERED (2, "Hang Glider, Powered"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Paraglider, Unpowered */
-// autogenerated using string template disenumpart2.txt
-
     PARAGLIDER_UNPOWERED (3, "Paraglider, Unpowered"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Paraglider, Powered */
-// autogenerated using string template disenumpart2.txt
-
     PARAGLIDER_POWERED (4, "Paraglider, Powered"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Powered Parachute */
-// autogenerated using string template disenumpart2.txt
-
-    POWERED_PARACHUTE (5, "Powered Parachute"),;
-
-// autogenerated using string template disenumpart25.txt
+    POWERED_PARACHUTE (5, "Powered Parachute");
 
     private int value;
     private final String description;
@@ -99,8 +75,6 @@ public enum PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories imple
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java
index 4e95242af632a08c0fccb7e5747b05907816c008..4c694cb9dacf08c705ac00a1f188abfb099e2b9b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java
@@ -7,31 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 275, marshal size 8,
- * PlatformAirCivilianUltralightRigidWingAircraftSubcategories
+ * Generated from XML, <br>
+ * UID 275 marshal size 8<br>
+ * PlatformAirCivilianUltralightRigidWingAircraftSubcategories<br>
  * Subcategories for Air Platform Category 81
  */
 public enum PlatformAirCivilianUltralightRigidWingAircraftSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Weight-shift control */
-// autogenerated using string template disenumpart2.txt
-
     WEIGHT_SHIFT_CONTROL (1, "Weight-shift control"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Control surface (elevator, rudder, aileron) control */
-// autogenerated using string template disenumpart2.txt
-
-    CONTROL_SURFACE_ELEVATOR_RUDDER_AILERON_CONTROL (2, "Control surface (elevator, rudder, aileron) control"),;
-
-// autogenerated using string template disenumpart25.txt
+    CONTROL_SURFACE_ELEVATOR_RUDDER_AILERON_CONTROL (2, "Control surface (elevator, rudder, aileron) control");
 
     private int value;
     private final String description;
@@ -81,8 +69,6 @@ public enum PlatformAirCivilianUltralightRigidWingAircraftSubcategories implemen
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformDomain.java
index b3cc5e4ffac0b430f765e8124d7ca00f7d5e6b23..18ff164f5cb6f6651265d11f72047ebcccdb7c26 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformDomain.java
@@ -7,54 +7,25 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 8,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 8 marshal size 8<br>
  * PlatformDomain
  */
 public enum PlatformDomain 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Land */
-// autogenerated using string template disenumpart2.txt
-
     LAND (1, "Land"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Air */
-// autogenerated using string template disenumpart2.txt
-
     AIR (2, "Air"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Surface */
-// autogenerated using string template disenumpart2.txt
-
     SURFACE (3, "Surface"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Subsurface */
-// autogenerated using string template disenumpart2.txt
-
     SUBSURFACE (4, "Subsurface"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Space */
-// autogenerated using string template disenumpart2.txt
-
-    SPACE (5, "Space"),;
-
-// autogenerated using string template disenumpart25.txt
+    SPACE (5, "Space");
 
     private int value;
     private final String description;
@@ -104,8 +75,6 @@ public enum PlatformDomain
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandBusSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandBusSubcategories.java
index 11ff3987f9bc2b43302431793b1b3d103e8f1a55..9d987ee898f67452171ebc1f9bb946e14945eba6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandBusSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandBusSubcategories.java
@@ -7,133 +7,53 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 429, marshal size 8,
- * PlatformLandBusSubcategories
+ * Generated from XML, <br>
+ * UID 429 marshal size 8<br>
+ * PlatformLandBusSubcategories<br>
  * Subcategories for Land Platform Category 82
  */
 public enum PlatformLandBusSubcategories 
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Commuter (Flat Nose) */
-// autogenerated using string template disenumpart2.txt
-
     COMMUTER_FLAT_NOSE (1, "Commuter (Flat Nose)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Commuter (Snout Nose) */
-// autogenerated using string template disenumpart2.txt
-
     COMMUTER_SNOUT_NOSE (2, "Commuter (Snout Nose)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Shuttle */
-// autogenerated using string template disenumpart2.txt
-
     SHUTTLE (3, "Shuttle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Double Decker */
-// autogenerated using string template disenumpart2.txt
-
     DOUBLE_DECKER (4, "Double Decker"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Guided */
-// autogenerated using string template disenumpart2.txt
-
     GUIDED (5, "Guided"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Kneeling */
-// autogenerated using string template disenumpart2.txt
-
     KNEELING (6, "Kneeling"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Midibus */
-// autogenerated using string template disenumpart2.txt
-
     MIDIBUS (7, "Midibus"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Minibus */
-// autogenerated using string template disenumpart2.txt
-
     MINIBUS (8, "Minibus"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mini Wheelchair */
-// autogenerated using string template disenumpart2.txt
-
     MINI_WHEELCHAIR (9, "Mini Wheelchair"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Motorcoach */
-// autogenerated using string template disenumpart2.txt
-
     MOTORCOACH (10, "Motorcoach"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Prison Bus */
-// autogenerated using string template disenumpart2.txt
-
     PRISON_BUS (11, "Prison Bus"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Schoolbus */
-// autogenerated using string template disenumpart2.txt
-
     SCHOOLBUS (12, "Schoolbus"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** School Wheelchair */
-// autogenerated using string template disenumpart2.txt
-
     SCHOOL_WHEELCHAIR (13, "School Wheelchair"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tour */
-// autogenerated using string template disenumpart2.txt
-
     TOUR (14, "Tour"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tram Parking Lot */
-// autogenerated using string template disenumpart2.txt
-
     TRAM_PARKING_LOT (15, "Tram Parking Lot"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trolley */
-// autogenerated using string template disenumpart2.txt
-
     TROLLEY (16, "Trolley"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Airport Transport */
-// autogenerated using string template disenumpart2.txt
-
     AIRPORT_TRANSPORT (17, "Airport Transport"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Articulated (Multi-Unit) */
-// autogenerated using string template disenumpart2.txt
-
-    ARTICULATED_MULTI_UNIT (18, "Articulated (Multi-Unit)"),;
-
-// autogenerated using string template disenumpart25.txt
+    ARTICULATED_MULTI_UNIT (18, "Articulated (Multi-Unit)");
 
     private int value;
     private final String description;
@@ -183,8 +103,6 @@ public enum PlatformLandBusSubcategories
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCarSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCarSubcategories.java
index b79e81ed3387aaf2a0275b6e6936dd67a16887b8..d8c570e9760e30f5b30484d23c23b3e03bc82ee3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCarSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCarSubcategories.java
@@ -7,283 +7,103 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 428, marshal size 8,
- * PlatformLandCarSubcategories
+ * Generated from XML, <br>
+ * UID 428 marshal size 8<br>
+ * PlatformLandCarSubcategories<br>
  * Subcategories for Land Platform Category 81. Subcategory values have the general form/style in the 10s/100s digits and the size in the 1s digit. A zero in the 1s digit indicates an unspecified size.
  */
 public enum PlatformLandCarSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Generic, No specific enumerations may be placed in this subcategory */
-// autogenerated using string template disenumpart2.txt
-
     GENERIC (10, "Generic"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Generic, Mini/Microcar (Tiny), ACRISS M, N */
-// autogenerated using string template disenumpart2.txt
-
     GENERIC_MINI_MICROCAR_TINY (11, "Generic, Mini/Microcar (Tiny)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Generic, Economy/Compact (Small), ACRISS E, H, C, D */
-// autogenerated using string template disenumpart2.txt
-
     GENERIC_ECONOMY_COMPACT_SMALL (12, "Generic, Economy/Compact (Small)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Generic, Intermediate/Standard (Medium), ACRISS I, J, S, R */
-// autogenerated using string template disenumpart2.txt
-
     GENERIC_INTERMEDIATE_STANDARD_MEDIUM (13, "Generic, Intermediate/Standard (Medium)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Generic, Full/Premium/Luxury (Large), ACRISS F, G, P, U, L, W */
-// autogenerated using string template disenumpart2.txt
-
     GENERIC_FULL_PREMIUM_LUXURY_LARGE (14, "Generic, Full/Premium/Luxury (Large)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Generic, Oversize, ACRISS O */
-// autogenerated using string template disenumpart2.txt
-
     GENERIC_OVERSIZE (15, "Generic, Oversize"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 2-Door (Coupe), No specific enumerations may be placed in this subcategory */
-// autogenerated using string template disenumpart2.txt
-
     _2_DOOR_COUPE (20, "2-Door (Coupe)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 2-Door (Coupe), Mini/Microcar (Tiny) */
-// autogenerated using string template disenumpart2.txt
-
     _2_DOOR_COUPE_MINI_MICROCAR_TINY (21, "2-Door (Coupe), Mini/Microcar (Tiny)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 2-Door (Coupe), Economy/Compact (Small) */
-// autogenerated using string template disenumpart2.txt
-
     _2_DOOR_COUPE_ECONOMY_COMPACT_SMALL (22, "2-Door (Coupe), Economy/Compact (Small)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 2-Door (Coupe), Intermediate/Standard (Medium) */
-// autogenerated using string template disenumpart2.txt
-
     _2_DOOR_COUPE_INTERMEDIATE_STANDARD_MEDIUM (23, "2-Door (Coupe), Intermediate/Standard (Medium)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 3-Door Hatchback, No specific enumerations may be placed in this subcategory */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "3-Door Hatchback"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 3-Door Hatchback, Mini/Microcar (Tiny) */
-// autogenerated using string template disenumpart2.txt
-
     _3_DOOR_HATCHBACK_MINI_MICROCAR_TINY (31, "3-Door Hatchback, Mini/Microcar (Tiny)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 3-Door Hatchback, Economy/Compact (Small) */
-// autogenerated using string template disenumpart2.txt
-
     _3_DOOR_HATCHBACK_ECONOMY_COMPACT_SMALL (32, "3-Door Hatchback, Economy/Compact (Small)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 4-Door Sedan, No specific enumerations may be placed in this subcategory */
-// autogenerated using string template disenumpart2.txt
-
     _4_DOOR_SEDAN (40, "4-Door Sedan"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 4-Door Sedan, Mini/Microcar (Tiny) */
-// autogenerated using string template disenumpart2.txt
-
     _4_DOOR_SEDAN_MINI_MICROCAR_TINY (41, "4-Door Sedan, Mini/Microcar (Tiny)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 4-Door Sedan, Economy/Compact (Small) */
-// autogenerated using string template disenumpart2.txt
-
     _4_DOOR_SEDAN_ECONOMY_COMPACT_SMALL (42, "4-Door Sedan, Economy/Compact (Small)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 4-Door Sedan, Intermediate/Standard (Medium) */
-// autogenerated using string template disenumpart2.txt
-
     _4_DOOR_SEDAN_INTERMEDIATE_STANDARD_MEDIUM (43, "4-Door Sedan, Intermediate/Standard (Medium)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 4-Door Sedan, Full/Premium/Luxury (Large) */
-// autogenerated using string template disenumpart2.txt
-
     _4_DOOR_SEDAN_FULL_PREMIUM_LUXURY_LARGE (44, "4-Door Sedan, Full/Premium/Luxury (Large)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 4-Door Sedan, Oversize */
-// autogenerated using string template disenumpart2.txt
-
     _4_DOOR_SEDAN_OVERSIZE (45, "4-Door Sedan, Oversize"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5-Door Hatchback, No specific enumerations may be placed in this subcategory */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "5-Door Hatchback"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5-Door Hatchback, Mini/Microcar (Tiny) */
-// autogenerated using string template disenumpart2.txt
-
     CREATE_ENTITY_RELIABLE (51, "5-Door Hatchback, Mini/Microcar (Tiny)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5-Door Hatchback, Economy/Compact (Small) */
-// autogenerated using string template disenumpart2.txt
-
     REMOVE_ENTITY_RELIABLE (52, "5-Door Hatchback, Economy/Compact (Small)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5-Door Hatchback, Intermediate/Standard (Medium) */
-// autogenerated using string template disenumpart2.txt
-
     START_RESUME_RELIABLE (53, "5-Door Hatchback, Intermediate/Standard (Medium)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 5-Door Hatchback, Full/Premium/Luxury (Large) */
-// autogenerated using string template disenumpart2.txt
-
     STOP_FREEZE_RELIABLE (54, "5-Door Hatchback, Full/Premium/Luxury (Large)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Wagon, No specific enumerations may be placed in this subcategory */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "Wagon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Wagon, Economy/Compact (Small) */
-// autogenerated using string template disenumpart2.txt
-
     COMMENT_RELIABLE (62, "Wagon, Economy/Compact (Small)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Wagon, Intermediate/Standard (Medium) */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_RELIABLE (63, "Wagon, Intermediate/Standard (Medium)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Wagon, Full/Premium/Luxury (Large) */
-// autogenerated using string template disenumpart2.txt
-
     SET_RECORD_RELIABLE	 (64, "Wagon, Full/Premium/Luxury (Large)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Minivan, No specific enumerations may be placed in this subcategory */
-// autogenerated using string template disenumpart2.txt
-
     MINIVAN (70, "Minivan"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Limousine, No specific enumerations may be placed in this subcategory */
-// autogenerated using string template disenumpart2.txt
-
     LIMOUSINE (80, "Limousine"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Limousine, Full/Premium/Luxury (Large) */
-// autogenerated using string template disenumpart2.txt
-
     LIMOUSINE_FULL_PREMIUM_LUXURY_LARGE (84, "Limousine, Full/Premium/Luxury (Large)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Limousine, Oversize */
-// autogenerated using string template disenumpart2.txt
-
     LIMOUSINE_OVERSIZE (85, "Limousine, Oversize"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sports (High Performance) */
-// autogenerated using string template disenumpart2.txt
-
     SPORTS_HIGH_PERFORMANCE (90, "Sports (High Performance)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Convertible, No specific enumerations may be placed in this subcategory */
-// autogenerated using string template disenumpart2.txt
-
     CONVERTIBLE (100, "Convertible"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Convertible, Mini/Microcar (Tiny) */
-// autogenerated using string template disenumpart2.txt
-
     CONVERTIBLE_MINI_MICROCAR_TINY (101, "Convertible, Mini/Microcar (Tiny)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Convertible, Economy/Compact (Small) */
-// autogenerated using string template disenumpart2.txt
-
     CONVERTIBLE_ECONOMY_COMPACT_SMALL (102, "Convertible, Economy/Compact (Small)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Convertible, Intermediate/Standard (Medium) */
-// autogenerated using string template disenumpart2.txt
-
     CONVERTIBLE_INTERMEDIATE_STANDARD_MEDIUM (103, "Convertible, Intermediate/Standard (Medium)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Convertible, Full/Premium/Luxury (Large) */
-// autogenerated using string template disenumpart2.txt
-
     CONVERTIBLE_FULL_PREMIUM_LUXURY_LARGE (104, "Convertible, Full/Premium/Luxury (Large)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sports Utility Vehicle (SUV), No specific enumerations may be placed in this subcategory */
-// autogenerated using string template disenumpart2.txt
-
     SPORTS_UTILITY_VEHICLE_SUV (110, "Sports Utility Vehicle (SUV)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sports Utility Vehicle (SUV), Economy/Compact (Small) */
-// autogenerated using string template disenumpart2.txt
-
     SPORTS_UTILITY_VEHICLE_SUV_ECONOMY_COMPACT_SMALL (112, "Sports Utility Vehicle (SUV), Economy/Compact (Small)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sports Utility Vehicle (SUV), Intermediate/Standard (Medium) */
-// autogenerated using string template disenumpart2.txt
-
     SPORTS_UTILITY_VEHICLE_SUV_INTERMEDIATE_STANDARD_MEDIUM (113, "Sports Utility Vehicle (SUV), Intermediate/Standard (Medium)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sports Utility Vehicle (SUV), Full/Premium/Luxury (Large) */
-// autogenerated using string template disenumpart2.txt
-
     SPORTS_UTILITY_VEHICLE_SUV_FULL_PREMIUM_LUXURY_LARGE (114, "Sports Utility Vehicle (SUV), Full/Premium/Luxury (Large)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sports Utility Vehicle (SUV), Oversize */
-// autogenerated using string template disenumpart2.txt
-
-    SPORTS_UTILITY_VEHICLE_SUV_OVERSIZE (115, "Sports Utility Vehicle (SUV), Oversize"),;
-
-// autogenerated using string template disenumpart25.txt
+    SPORTS_UTILITY_VEHICLE_SUV_OVERSIZE (115, "Sports Utility Vehicle (SUV), Oversize");
 
     private int value;
     private final String description;
@@ -333,8 +153,6 @@ public enum PlatformLandCarSubcategories implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCategory.java
index 2b129523b45ce0ce8c1922cbfb9a420861a2bed5..4ef832ce12bfc7829e346fa77f77f66f09efec76 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCategory.java
@@ -7,340 +7,111 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 9,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 9 marshal size 8<br>
  * PlatformLandCategory
  */
 public enum PlatformLandCategory implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tank */
-// autogenerated using string template disenumpart2.txt
-
     TANK (1, "Tank"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Armored Fighting Vehicle, FV, APC, SP mortars, armored cars, chemical reconnaissance, Anti-Tank guided missile launchers, etc. */
-// autogenerated using string template disenumpart2.txt
-
     ARMORED_FIGHTING_VEHICLE (2, "Armored Fighting Vehicle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Armored Utility Vehicle, Engineering vehicle, tracked load carriers, towing vehicles, recovery vehicles, AVLB, etc. */
-// autogenerated using string template disenumpart2.txt
-
     ARMORED_UTILITY_VEHICLE (3, "Armored Utility Vehicle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Self-Propelled Artillery */
-// autogenerated using string template disenumpart2.txt
-
     SELF_PROPELLED_ARTILLERY (4, "Self-Propelled Artillery"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Towed Artillery, Anti-Tank guns, guns and howitzers */
-// autogenerated using string template disenumpart2.txt
-
     TOWED_ARTILLERY (5, "Towed Artillery"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Small Wheeled Utility Vehicle, 0-1.25 tons */
-// autogenerated using string template disenumpart2.txt
-
     SMALL_WHEELED_UTILITY_VEHICLE (6, "Small Wheeled Utility Vehicle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Large Wheeled Utility Vehicle, Greater than 1.25 tons */
-// autogenerated using string template disenumpart2.txt
-
     LARGE_WHEELED_UTILITY_VEHICLE (7, "Large Wheeled Utility Vehicle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Small Tracked Utility Vehicle, 0-4999 kg weight load */
-// autogenerated using string template disenumpart2.txt
-
     SMALL_TRACKED_UTILITY_VEHICLE (8, "Small Tracked Utility Vehicle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Large Tracked Utility Vehicle, Greater than 4999 kg weight load */
-// autogenerated using string template disenumpart2.txt
-
     LARGE_TRACKED_UTILITY_VEHICLE (9, "Large Tracked Utility Vehicle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mortar */
-// autogenerated using string template disenumpart2.txt
-
     MORTAR (10, "Mortar"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mine Plow */
-// autogenerated using string template disenumpart2.txt
-
     MINE_PLOW (11, "Mine Plow"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mine Rake */
-// autogenerated using string template disenumpart2.txt
-
     MINE_RAKE (12, "Mine Rake"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mine Roller */
-// autogenerated using string template disenumpart2.txt
-
     MINE_ROLLER (13, "Mine Roller"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cargo Trailer */
-// autogenerated using string template disenumpart2.txt
-
     CARGO_TRAILER (14, "Cargo Trailer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fuel Trailer */
-// autogenerated using string template disenumpart2.txt
-
     FUEL_TRAILER (15, "Fuel Trailer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Generator Trailer */
-// autogenerated using string template disenumpart2.txt
-
     GENERATOR_TRAILER (16, "Generator Trailer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Water Trailer */
-// autogenerated using string template disenumpart2.txt
-
     WATER_TRAILER (17, "Water Trailer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Engineer Equipment */
-// autogenerated using string template disenumpart2.txt
-
     ENGINEER_EQUIPMENT (18, "Engineer Equipment"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Heavy Equipment Transport Trailer */
-// autogenerated using string template disenumpart2.txt
-
     HEAVY_EQUIPMENT_TRANSPORT_TRAILER (19, "Heavy Equipment Transport Trailer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Maintenance Equipment Trailer */
-// autogenerated using string template disenumpart2.txt
-
     MAINTENANCE_EQUIPMENT_TRAILER (20, "Maintenance Equipment Trailer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Limber */
-// autogenerated using string template disenumpart2.txt
-
     LIMBER (21, "Limber"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Chemical Decontamination Trailer */
-// autogenerated using string template disenumpart2.txt
-
     CHEMICAL_DECONTAMINATION_TRAILER (22, "Chemical Decontamination Trailer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Warning System */
-// autogenerated using string template disenumpart2.txt
-
     WARNING_SYSTEM (23, "Warning System"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Train - Engine */
-// autogenerated using string template disenumpart2.txt
-
     TRAIN_ENGINE (24, "Train - Engine"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Train - Car */
-// autogenerated using string template disenumpart2.txt
-
     TRAIN_CAR (25, "Train - Car"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Train - Caboose */
-// autogenerated using string template disenumpart2.txt
-
     TRAIN_CABOOSE (26, "Train - Caboose"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Civilian Vehicle, Civilian land vehicles were moved to a group of Category values starting at 80 */
-// autogenerated using string template disenumpart2.txt
-
     CIVILIAN_VEHICLE (27, "Civilian Vehicle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Air Defense / Missile Defense Unit Equipment */
-// autogenerated using string template disenumpart2.txt
-
     IDENTIFICATION_FRIEND_OR_FOE (28, "Air Defense / Missile Defense Unit Equipment"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Command, Control, Communications, and Intelligence (C3I) System */
-// autogenerated using string template disenumpart2.txt
-
     COMMAND_CONTROL_COMMUNICATIONS_AND_INTELLIGENCE_C3I_SYSTEM (29, "Command, Control, Communications, and Intelligence (C3I) System"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Operations Facility */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Operations Facility"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Intelligence Facility */
-// autogenerated using string template disenumpart2.txt
-
     INTELLIGENCE_FACILITY (31, "Intelligence Facility"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Surveillance Facility */
-// autogenerated using string template disenumpart2.txt
-
     SURVEILLANCE_FACILITY (32, "Surveillance Facility"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Communications Facility */
-// autogenerated using string template disenumpart2.txt
-
     COMMUNICATIONS_FACILITY (33, "Communications Facility"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Command Facility */
-// autogenerated using string template disenumpart2.txt
-
     COMMAND_FACILITY (34, "Command Facility"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** C4I Facility */
-// autogenerated using string template disenumpart2.txt
-
     C4I_FACILITY (35, "C4I Facility"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Control Facility */
-// autogenerated using string template disenumpart2.txt
-
     CONTROL_FACILITY (36, "Control Facility"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fire Control Facility */
-// autogenerated using string template disenumpart2.txt
-
     FIRE_CONTROL_FACILITY (37, "Fire Control Facility"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Missile Defense Facility */
-// autogenerated using string template disenumpart2.txt
-
     MISSILE_DEFENSE_FACILITY (38, "Missile Defense Facility"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Field Command Post */
-// autogenerated using string template disenumpart2.txt
-
     FIELD_COMMAND_POST (39, "Field Command Post"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Observation Post */
-// autogenerated using string template disenumpart2.txt
-
     OBSERVATION_POST (40, "Observation Post"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Unmanned */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "Unmanned"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformLandMotorcycleSubcategories */// autogenerated using string template disenumpart21.txt
-
-    MOTORCYCLE_2 (80, "Motorcycle"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformLandCarSubcategories */// autogenerated using string template disenumpart21.txt
-
-    CAR_2 (81, "Car"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformLandBusSubcategories */// autogenerated using string template disenumpart21.txt
-
-    BUS_2 (82, "Bus"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformLandSingleUnitCargoTruckSubcategories */// autogenerated using string template disenumpart21.txt
-
-    SINGLE_UNIT_CARGO_TRUCK_2 (83, "Single Unit Cargo Truck"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformLandSingleUnitUtilityEmergencyTruckSubcategories */// autogenerated using string template disenumpart21.txt
-
-    SINGLE_UNIT_UTILITY_EMERGENCY_TRUCK_2 (84, "Single Unit Utility/Emergency Truck"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformLandMultipleUnitCargoTruckSubcategories */// autogenerated using string template disenumpart21.txt
-
-    MULTIPLE_UNIT_CARGO_TRUCK_2 (85, "Multiple Unit Cargo Truck"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories */// autogenerated using string template disenumpart21.txt
-
-    MULTIPLE_UNIT_UTILITY_EMERGENCY_TRUCK_2 (86, "Multiple Unit Utility/Emergency Truck"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformLandConstructionSpecialtyVehicleSubcategories */// autogenerated using string template disenumpart21.txt
-
-    CONSTRUCTION_SPECIALTY_VEHICLE_2 (87, "Construction Specialty Vehicle"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformLandFarmSpecialtyVehicleSubcategories */// autogenerated using string template disenumpart21.txt
-
-    FARM_SPECIALTY_VEHICLE_2 (88, "Farm Specialty Vehicle"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformLandTrailerSubcategories */// autogenerated using string template disenumpart21.txt
-
-    TRAILER_2 (89, "Trailer"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformLandRecreationalSubcategories */// autogenerated using string template disenumpart21.txt
-
-    RECREATIONAL_2 (90, "Recreational"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformLandNonmotorizedSubcategories */// autogenerated using string template disenumpart21.txt
-
-    NON_MOTORIZED_2 (91, "Non-motorized"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformLandTrainsSubcategories */// autogenerated using string template disenumpart21.txt
-
-    TRAINS_2 (92, "Trains"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformLandUtilityEmergencyCarSubcategories */// autogenerated using string template disenumpart21.txt
-
-    UTILITY_EMERGENCY_CAR_2 (93, "Utility/Emergency Car"),;
-
-// autogenerated using string template disenumpart25.txt
+    /** PlatformLandMotorcycleSubcategories */    MOTORCYCLE_2 (80, "Motorcycle"),
+    /** PlatformLandCarSubcategories */    CAR_2 (81, "Car"),
+    /** PlatformLandBusSubcategories */    BUS_2 (82, "Bus"),
+    /** PlatformLandSingleUnitCargoTruckSubcategories */    SINGLE_UNIT_CARGO_TRUCK_2 (83, "Single Unit Cargo Truck"),
+    /** PlatformLandSingleUnitUtilityEmergencyTruckSubcategories */    SINGLE_UNIT_UTILITY_EMERGENCY_TRUCK_2 (84, "Single Unit Utility/Emergency Truck"),
+    /** PlatformLandMultipleUnitCargoTruckSubcategories */    MULTIPLE_UNIT_CARGO_TRUCK_2 (85, "Multiple Unit Cargo Truck"),
+    /** PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories */    MULTIPLE_UNIT_UTILITY_EMERGENCY_TRUCK_2 (86, "Multiple Unit Utility/Emergency Truck"),
+    /** PlatformLandConstructionSpecialtyVehicleSubcategories */    CONSTRUCTION_SPECIALTY_VEHICLE_2 (87, "Construction Specialty Vehicle"),
+    /** PlatformLandFarmSpecialtyVehicleSubcategories */    FARM_SPECIALTY_VEHICLE_2 (88, "Farm Specialty Vehicle"),
+    /** PlatformLandTrailerSubcategories */    TRAILER_2 (89, "Trailer"),
+    /** PlatformLandRecreationalSubcategories */    RECREATIONAL_2 (90, "Recreational"),
+    /** PlatformLandNonmotorizedSubcategories */    NON_MOTORIZED_2 (91, "Non-motorized"),
+    /** PlatformLandTrainsSubcategories */    TRAINS_2 (92, "Trains"),
+    /** PlatformLandUtilityEmergencyCarSubcategories */    UTILITY_EMERGENCY_CAR_2 (93, "Utility/Emergency Car");
 
     private int value;
     private final String description;
@@ -390,8 +161,6 @@ public enum PlatformLandCategory implements Category
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java
index 87038227824f63fc2313dbd7d50776092ac529bd..6facdf1ff9d0f1e03737c3e142d777a27e9365c2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java
@@ -7,355 +7,127 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 434, marshal size 8,
- * PlatformLandConstructionSpecialtyVehicleSubcategories
+ * Generated from XML, <br>
+ * UID 434 marshal size 8<br>
+ * PlatformLandConstructionSpecialtyVehicleSubcategories<br>
  * Subcategories for Land Platform Category 87
  */
 public enum PlatformLandConstructionSpecialtyVehicleSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tug */
-// autogenerated using string template disenumpart2.txt
-
     TUG (1, "Tug"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Forklift */
-// autogenerated using string template disenumpart2.txt
-
     FORKLIFT (2, "Forklift"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Loader */
-// autogenerated using string template disenumpart2.txt
-
     LOADER (3, "Loader"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Loader, Backhoe */
-// autogenerated using string template disenumpart2.txt
-
     LOADER_BACKHOE (4, "Loader, Backhoe"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Crane, Tractor Mounted */
-// autogenerated using string template disenumpart2.txt
-
     CRANE_TRACTOR_MOUNTED (5, "Crane, Tractor Mounted"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Crane, Wheeled */
-// autogenerated using string template disenumpart2.txt
-
     CRANE_WHEELED (6, "Crane, Wheeled"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Grader */
-// autogenerated using string template disenumpart2.txt
-
     GRADER (7, "Grader"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Road Roller, Other */
-// autogenerated using string template disenumpart2.txt
-
     ROAD_ROLLER_OTHER (8, "Road Roller, Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Road Roller, Double Drum, Smooth */
-// autogenerated using string template disenumpart2.txt
-
     ROAD_ROLLER_DOUBLE_DRUM_SMOOTH (9, "Road Roller, Double Drum, Smooth"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Road Roller, Single Drum, Smooth */
-// autogenerated using string template disenumpart2.txt
-
     ROAD_ROLLER_SINGLE_DRUM_SMOOTH (10, "Road Roller, Single Drum, Smooth"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Road Roller, Double Drum, Sheeps */
-// autogenerated using string template disenumpart2.txt
-
     ROAD_ROLLER_DOUBLE_DRUM_SHEEPS (11, "Road Roller, Double Drum, Sheeps"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Road Roller, Single Drum, Sheeps */
-// autogenerated using string template disenumpart2.txt
-
     ROAD_ROLLER_SINGLE_DRUM_SHEEPS (12, "Road Roller, Single Drum, Sheeps"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Road Roller, Pneumatic Tired */
-// autogenerated using string template disenumpart2.txt
-
     ROAD_ROLLER_PNEUMATIC_TIRED (13, "Road Roller, Pneumatic Tired"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Excavator, Other */
-// autogenerated using string template disenumpart2.txt
-
     EXCAVATOR_OTHER (14, "Excavator, Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Excavator, Dragline */
-// autogenerated using string template disenumpart2.txt
-
     EXCAVATOR_DRAGLINE (15, "Excavator, Dragline"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Excavator, Long Reach */
-// autogenerated using string template disenumpart2.txt
-
     EXCAVATOR_LONG_REACH (16, "Excavator, Long Reach"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Excavator, Mobile Tire */
-// autogenerated using string template disenumpart2.txt
-
     EXCAVATOR_MOBILE_TIRE (17, "Excavator, Mobile Tire"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mini Excavator */
-// autogenerated using string template disenumpart2.txt
-
     MINI_EXCAVATOR (18, "Mini Excavator"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Excavator Giant */
-// autogenerated using string template disenumpart2.txt
-
     EXCAVATOR_GIANT (19, "Excavator Giant"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bulldozer, Tractor Mounted */
-// autogenerated using string template disenumpart2.txt
-
     BULLDOZER_TRACTOR_MOUNTED (20, "Bulldozer, Tractor Mounted"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bulldozer, Tracked */
-// autogenerated using string template disenumpart2.txt
-
     BULLDOZER_TRACKED (21, "Bulldozer, Tracked"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Scraper */
-// autogenerated using string template disenumpart2.txt
-
     SCRAPER (22, "Scraper"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Skid Steer */
-// autogenerated using string template disenumpart2.txt
-
     SKID_STEER (23, "Skid Steer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dump Truck, Other */
-// autogenerated using string template disenumpart2.txt
-
     DUMP_TRUCK_OTHER (24, "Dump Truck, Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dump Truck, Articulated */
-// autogenerated using string template disenumpart2.txt
-
     DUMP_TRUCK_ARTICULATED (25, "Dump Truck, Articulated"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dump Truck, Transfer */
-// autogenerated using string template disenumpart2.txt
-
     DUMP_TRUCK_TRANSFER (26, "Dump Truck, Transfer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dump Truck, Super */
-// autogenerated using string template disenumpart2.txt
-
     DUMP_TRUCK_SUPER (27, "Dump Truck, Super"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dump Truck, Off Road */
-// autogenerated using string template disenumpart2.txt
-
     IDENTIFICATION_FRIEND_OR_FOE (28, "Dump Truck, Off Road"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Paver */
-// autogenerated using string template disenumpart2.txt
-
     PAVER (29, "Paver"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Drilling Machine */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Drilling Machine"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Concrete Mixer, Other */
-// autogenerated using string template disenumpart2.txt
-
     CONCRETE_MIXER_OTHER (31, "Concrete Mixer, Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Concrete Mixer, Rear Discharge */
-// autogenerated using string template disenumpart2.txt
-
     CONCRETE_MIXER_REAR_DISCHARGE (32, "Concrete Mixer, Rear Discharge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Concrete Mixer, Front Discharge */
-// autogenerated using string template disenumpart2.txt
-
     CONCRETE_MIXER_FRONT_DISCHARGE (33, "Concrete Mixer, Front Discharge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Concrete Mixer, Six Axle */
-// autogenerated using string template disenumpart2.txt
-
     CONCRETE_MIXER_SIX_AXLE (34, "Concrete Mixer, Six Axle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Concrete Mixer, Long Reach Boom */
-// autogenerated using string template disenumpart2.txt
-
     CONCRETE_MIXER_LONG_REACH_BOOM (35, "Concrete Mixer, Long Reach Boom"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Concrete Mixer, Volumetric */
-// autogenerated using string template disenumpart2.txt
-
     CONCRETE_MIXER_VOLUMETRIC (36, "Concrete Mixer, Volumetric"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trencher, Chain */
-// autogenerated using string template disenumpart2.txt
-
     TRENCHER_CHAIN (37, "Trencher, Chain"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trencher, Rockwheel */
-// autogenerated using string template disenumpart2.txt
-
     TRENCHER_ROCKWHEEL (38, "Trencher, Rockwheel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Snowcat */
-// autogenerated using string template disenumpart2.txt
-
     SNOWCAT (39, "Snowcat"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Crane, Tracked */
-// autogenerated using string template disenumpart2.txt
-
     CRANE_TRACKED (40, "Crane, Tracked"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Crane, Shovel */
-// autogenerated using string template disenumpart2.txt
-
     CRANE_SHOVEL (41, "Crane, Shovel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sweeper, Rotary */
-// autogenerated using string template disenumpart2.txt
-
     SWEEPER_ROTARY (42, "Sweeper, Rotary"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Roller, Vibratory Compactor */
-// autogenerated using string template disenumpart2.txt
-
     ROLLER_VIBRATORY_COMPACTOR (43, "Roller, Vibratory Compactor"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fork Lift, Truck */
-// autogenerated using string template disenumpart2.txt
-
     FORK_LIFT_TRUCK (44, "Fork Lift, Truck"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fork Lift, Rought Terrain */
-// autogenerated using string template disenumpart2.txt
-
     FORK_LIFT_ROUGHT_TERRAIN (45, "Fork Lift, Rought Terrain"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Transloader */
-// autogenerated using string template disenumpart2.txt
-
     TIME_SPACE_POSITION_INFORMATION (46, "Transloader"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Truck, Water, Construction */
-// autogenerated using string template disenumpart2.txt
-
     TRUCK_WATER_CONSTRUCTION (47, "Truck, Water, Construction"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Truck, Fuel Delivery */
-// autogenerated using string template disenumpart2.txt
-
     TRUCK_FUEL_DELIVERY (48, "Truck, Fuel Delivery"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Truck, Sawmill */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_FIRE (49, "Truck, Sawmill"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Truck, Line Marking, Construction */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "Truck, Line Marking, Construction"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tractor, Industrial */
-// autogenerated using string template disenumpart2.txt
-
     CREATE_ENTITY_RELIABLE (51, "Tractor, Industrial"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Compactor, High Speed */
-// autogenerated using string template disenumpart2.txt
-
     REMOVE_ENTITY_RELIABLE (52, "Compactor, High Speed"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Truck, Drilling */
-// autogenerated using string template disenumpart2.txt
-
     START_RESUME_RELIABLE (53, "Truck, Drilling"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Truck, Drilling Support */
-// autogenerated using string template disenumpart2.txt
-
     STOP_FREEZE_RELIABLE (54, "Truck, Drilling Support"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Crane, Construction */
-// autogenerated using string template disenumpart2.txt
-
-    ACKNOWLEDGE_RELIABLE (55, "Crane, Construction"),;
-
-// autogenerated using string template disenumpart25.txt
+    ACKNOWLEDGE_RELIABLE (55, "Crane, Construction");
 
     private int value;
     private final String description;
@@ -405,8 +177,6 @@ public enum PlatformLandConstructionSpecialtyVehicleSubcategories implements Sub
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java
index 828ee350011137ac2170098db092f33e832314bb..bac637e3d89ae567d18e5b3026009075a7cb9ce0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java
@@ -7,73 +7,33 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 435, marshal size 8,
- * PlatformLandFarmSpecialtyVehicleSubcategories
+ * Generated from XML, <br>
+ * UID 435 marshal size 8<br>
+ * PlatformLandFarmSpecialtyVehicleSubcategories<br>
  * Subcategories for Land Platform Category 88
  */
 public enum PlatformLandFarmSpecialtyVehicleSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tractor */
-// autogenerated using string template disenumpart2.txt
-
     TRACTOR (1, "Tractor"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Harvester/Reaper */
-// autogenerated using string template disenumpart2.txt
-
     HARVESTER_REAPER (2, "Harvester/Reaper"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Skidder */
-// autogenerated using string template disenumpart2.txt
-
     SKIDDER (3, "Skidder"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Forwarder */
-// autogenerated using string template disenumpart2.txt
-
     FORWARDER (4, "Forwarder"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Lawn Mower, Other */
-// autogenerated using string template disenumpart2.txt
-
     LAWN_MOWER_OTHER (5, "Lawn Mower, Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Lawn Mower, Riding */
-// autogenerated using string template disenumpart2.txt
-
     LAWN_MOWER_RIDING (6, "Lawn Mower, Riding"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Lawn Mower, Standing */
-// autogenerated using string template disenumpart2.txt
-
     LAWN_MOWER_STANDING (7, "Lawn Mower, Standing"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Lawn Mower, Push */
-// autogenerated using string template disenumpart2.txt
-
-    LAWN_MOWER_PUSH (8, "Lawn Mower, Push"),;
-
-// autogenerated using string template disenumpart25.txt
+    LAWN_MOWER_PUSH (8, "Lawn Mower, Push");
 
     private int value;
     private final String description;
@@ -123,8 +83,6 @@ public enum PlatformLandFarmSpecialtyVehicleSubcategories implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMotorcycleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMotorcycleSubcategories.java
index 8cb336d4a7d1a95936afc08793cd3f4fadb22e3a..ab320ffee7dd0beb6b3f8fd410209407d98843fb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMotorcycleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMotorcycleSubcategories.java
@@ -7,49 +7,25 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 427, marshal size 8,
- * PlatformLandMotorcycleSubcategories
+ * Generated from XML, <br>
+ * UID 427 marshal size 8<br>
+ * PlatformLandMotorcycleSubcategories<br>
  * Subcategories for Land Platform Category 80
  */
 public enum PlatformLandMotorcycleSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Scooter (Small) */
-// autogenerated using string template disenumpart2.txt
-
     SCOOTER_SMALL (1, "Scooter (Small)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sport/Street (Mid-Size) */
-// autogenerated using string template disenumpart2.txt
-
     SPORT_STREET_MID_SIZE (2, "Sport/Street (Mid-Size)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cruiser (Large) */
-// autogenerated using string template disenumpart2.txt
-
     CRUISER_LARGE (3, "Cruiser (Large)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dirt Bike */
-// autogenerated using string template disenumpart2.txt
-
-    DIRT_BIKE (4, "Dirt Bike"),;
-
-// autogenerated using string template disenumpart25.txt
+    DIRT_BIKE (4, "Dirt Bike");
 
     private int value;
     private final String description;
@@ -99,8 +75,6 @@ public enum PlatformLandMotorcycleSubcategories implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java
index 82b72eb15ac31c70abf4487e6252840ac2ed0400..a0a2bb10dfe900bcc509d309c7ec1b33c1ccc64e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java
@@ -7,37 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 432, marshal size 8,
- * PlatformLandMultipleUnitCargoTruckSubcategories
+ * Generated from XML, <br>
+ * UID 432 marshal size 8<br>
+ * PlatformLandMultipleUnitCargoTruckSubcategories<br>
  * Subcategories for Land Platform Category 85
  */
 public enum PlatformLandMultipleUnitCargoTruckSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tractor Trailer */
-// autogenerated using string template disenumpart2.txt
-
     TRACTOR_TRAILER (1, "Tractor Trailer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tanker */
-// autogenerated using string template disenumpart2.txt
-
-    TANKER (2, "Tanker"),;
-
-// autogenerated using string template disenumpart25.txt
+    TANKER (2, "Tanker");
 
     private int value;
     private final String description;
@@ -87,8 +71,6 @@ public enum PlatformLandMultipleUnitCargoTruckSubcategories implements SubCatego
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java
index d3913fe72a8255d7d83358c1ed222ba8d3098621..3fb9641f619bd3cc7f2e03864a863481e3ac5bf0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java
@@ -7,31 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 433, marshal size 8,
- * PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories
+ * Generated from XML, <br>
+ * UID 433 marshal size 8<br>
+ * PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories<br>
  * Subcategories for Land Platform Category 86
  */
 public enum PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fire Engine, Hook And Ladder */
-// autogenerated using string template disenumpart2.txt
-
-    FIRE_ENGINE_HOOK_AND_LADDER (1, "Fire Engine, Hook And Ladder"),;
-
-// autogenerated using string template disenumpart25.txt
+    FIRE_ENGINE_HOOK_AND_LADDER (1, "Fire Engine, Hook And Ladder");
 
     private int value;
     private final String description;
@@ -81,8 +69,6 @@ public enum PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories implement
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandNonmotorizedSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandNonmotorizedSubcategories.java
index 3e5b3c2f36c55fcc11e0f802d229db2bebd0fac8..e3c7261c1a498f16c1c1db7cf204039f77ce1bdf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandNonmotorizedSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandNonmotorizedSubcategories.java
@@ -7,169 +7,65 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 438, marshal size 8,
- * PlatformLandNonmotorizedSubcategories
+ * Generated from XML, <br>
+ * UID 438 marshal size 8<br>
+ * PlatformLandNonmotorizedSubcategories<br>
  * Subcategories for Land Platform Category 91
  */
 public enum PlatformLandNonmotorizedSubcategories 
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Unicycle */
-// autogenerated using string template disenumpart2.txt
-
     UNICYCLE (1, "Unicycle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bicycle */
-// autogenerated using string template disenumpart2.txt
-
     BICYCLE (2, "Bicycle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bicycle, Mountain */
-// autogenerated using string template disenumpart2.txt
-
     BICYCLE_MOUNTAIN (3, "Bicycle, Mountain"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bicycle, Racing */
-// autogenerated using string template disenumpart2.txt
-
     BICYCLE_RACING (4, "Bicycle, Racing"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tricycle */
-// autogenerated using string template disenumpart2.txt
-
     TRICYCLE (5, "Tricycle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Quadricycle */
-// autogenerated using string template disenumpart2.txt
-
     QUADRICYCLE (6, "Quadricycle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Rickshaw, Two Person */
-// autogenerated using string template disenumpart2.txt
-
     RICKSHAW_TWO_PERSON (7, "Rickshaw, Two Person"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Rickshaw, One Person */
-// autogenerated using string template disenumpart2.txt
-
     RICKSHAW_ONE_PERSON (8, "Rickshaw, One Person"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tandem Bicycle */
-// autogenerated using string template disenumpart2.txt
-
     TANDEM_BICYCLE (9, "Tandem Bicycle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cycle Trailer */
-// autogenerated using string template disenumpart2.txt
-
     CYCLE_TRAILER (10, "Cycle Trailer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cycle Sidecar */
-// autogenerated using string template disenumpart2.txt
-
     CYCLE_SIDECAR (11, "Cycle Sidecar"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sled */
-// autogenerated using string template disenumpart2.txt
-
     SLED (12, "Sled"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Skis */
-// autogenerated using string template disenumpart2.txt
-
     SKIS (13, "Skis"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Snowboard */
-// autogenerated using string template disenumpart2.txt
-
     SNOWBOARD (14, "Snowboard"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Skateboard */
-// autogenerated using string template disenumpart2.txt
-
     SKATEBOARD (15, "Skateboard"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Skates */
-// autogenerated using string template disenumpart2.txt
-
     SKATES (16, "Skates"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Skates, In-Line */
-// autogenerated using string template disenumpart2.txt
-
     SKATES_IN_LINE (17, "Skates, In-Line"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Wagon Cart */
-// autogenerated using string template disenumpart2.txt
-
     WAGON_CART (18, "Wagon Cart"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dolly */
-// autogenerated using string template disenumpart2.txt
-
     DOLLY (19, "Dolly"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Handtruck */
-// autogenerated using string template disenumpart2.txt
-
     HANDTRUCK (20, "Handtruck"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Push Cart */
-// autogenerated using string template disenumpart2.txt
-
     PUSH_CART (21, "Push Cart"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Wheelbarrow */
-// autogenerated using string template disenumpart2.txt
-
     WHEELBARROW (22, "Wheelbarrow"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Kick Scooter */
-// autogenerated using string template disenumpart2.txt
-
     KICK_SCOOTER (23, "Kick Scooter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Wheelchair */
-// autogenerated using string template disenumpart2.txt
-
-    WHEELCHAIR (24, "Wheelchair"),;
-
-// autogenerated using string template disenumpart25.txt
+    WHEELCHAIR (24, "Wheelchair");
 
     private int value;
     private final String description;
@@ -219,8 +115,6 @@ public enum PlatformLandNonmotorizedSubcategories
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandRecreationalSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandRecreationalSubcategories.java
index 1862b055a41ef29590e2e89f432d5eb8da90dbc4..97cf8344ed81da4e284880af0bd35892ea09f443 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandRecreationalSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandRecreationalSubcategories.java
@@ -7,109 +7,45 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 437, marshal size 8,
- * PlatformLandRecreationalSubcategories
+ * Generated from XML, <br>
+ * UID 437 marshal size 8<br>
+ * PlatformLandRecreationalSubcategories<br>
  * Subcategories for Land Platform Category 90
  */
 public enum PlatformLandRecreationalSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** ATV, 2X4 */
-// autogenerated using string template disenumpart2.txt
-
     ATV_2X4 (1, "ATV, 2X4"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** ATV, 4X4 */
-// autogenerated using string template disenumpart2.txt
-
     ATV_4X4 (2, "ATV, 4X4"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** ATV, 6X6 */
-// autogenerated using string template disenumpart2.txt
-
     ATV_6X6 (3, "ATV, 6X6"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** ATV, 3-wheeled */
-// autogenerated using string template disenumpart2.txt
-
     ATV_3_WHEELED (4, "ATV, 3-wheeled"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Toy, Other */
-// autogenerated using string template disenumpart2.txt
-
     TOY_OTHER (5, "Toy, Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Toy, Car */
-// autogenerated using string template disenumpart2.txt
-
     TOY_CAR (6, "Toy, Car"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Toy, ATV */
-// autogenerated using string template disenumpart2.txt
-
     TOY_ATV (7, "Toy, ATV"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Golf Cart */
-// autogenerated using string template disenumpart2.txt
-
     GOLF_CART (8, "Golf Cart"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Snowmobile */
-// autogenerated using string template disenumpart2.txt
-
     SNOWMOBILE (9, "Snowmobile"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Recreational Vehicle */
-// autogenerated using string template disenumpart2.txt
-
     RECREATIONAL_VEHICLE (10, "Recreational Vehicle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Recreational Vehicle, Type A Motorhome */
-// autogenerated using string template disenumpart2.txt
-
     RECREATIONAL_VEHICLE_TYPE_A_MOTORHOME (11, "Recreational Vehicle, Type A Motorhome"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Recreational Vehicle, Type B Motorhome */
-// autogenerated using string template disenumpart2.txt
-
     RECREATIONAL_VEHICLE_TYPE_B_MOTORHOME (12, "Recreational Vehicle, Type B Motorhome"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Recreational Vehicle, Type C Motorhome */
-// autogenerated using string template disenumpart2.txt
-
     RECREATIONAL_VEHICLE_TYPE_C_MOTORHOME (13, "Recreational Vehicle, Type C Motorhome"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Conversion Van */
-// autogenerated using string template disenumpart2.txt
-
-    CONVERSION_VAN (14, "Conversion Van"),;
-
-// autogenerated using string template disenumpart25.txt
+    CONVERSION_VAN (14, "Conversion Van");
 
     private int value;
     private final String description;
@@ -159,8 +95,6 @@ public enum PlatformLandRecreationalSubcategories implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java
index 16ecface70ad2131cc4fbcd214a68fbb627fb1ab..77c839bfdaa2600ef21adfe450719c73979dac44 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java
@@ -7,211 +7,79 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 430, marshal size 8,
- * PlatformLandSingleUnitCargoTruckSubcategories
+ * Generated from XML, <br>
+ * UID 430 marshal size 8<br>
+ * PlatformLandSingleUnitCargoTruckSubcategories<br>
  * Subcategories for Land Platform Category 83
  */
 public enum PlatformLandSingleUnitCargoTruckSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pickup Truck, Mini */
-// autogenerated using string template disenumpart2.txt
-
     PICKUP_TRUCK_MINI (1, "Pickup Truck, Mini"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pickup Truck, Mid-Size */
-// autogenerated using string template disenumpart2.txt
-
     PICKUP_TRUCK_MID_SIZE (2, "Pickup Truck, Mid-Size"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pickup Truck, Full-Size */
-// autogenerated using string template disenumpart2.txt
-
     PICKUP_TRUCK_FULL_SIZE (3, "Pickup Truck, Full-Size"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pickup Truck, Crew Cab */
-// autogenerated using string template disenumpart2.txt
-
     PICKUP_TRUCK_CREW_CAB (4, "Pickup Truck, Crew Cab"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pickup Truck, Extended Cab */
-// autogenerated using string template disenumpart2.txt
-
     PICKUP_TRUCK_EXTENDED_CAB (5, "Pickup Truck, Extended Cab"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pickup Truck, Long Bed */
-// autogenerated using string template disenumpart2.txt
-
     PICKUP_TRUCK_LONG_BED (6, "Pickup Truck, Long Bed"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pickup Truck, Cab Forward */
-// autogenerated using string template disenumpart2.txt
-
     PICKUP_TRUCK_CAB_FORWARD (7, "Pickup Truck, Cab Forward"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cargo Truck */
-// autogenerated using string template disenumpart2.txt
-
     CARGO_TRUCK (10, "Cargo Truck"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cargo Truck, up to 2.5 Ton */
-// autogenerated using string template disenumpart2.txt
-
     CARGO_TRUCK_UP_TO_25_TON (11, "Cargo Truck, up to 2.5 Ton"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cargo Truck, up to 5 Ton */
-// autogenerated using string template disenumpart2.txt
-
     CARGO_TRUCK_UP_TO_5_TON (12, "Cargo Truck, up to 5 Ton"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cargo Truck, up to 7.5 Ton */
-// autogenerated using string template disenumpart2.txt
-
     CARGO_TRUCK_UP_TO_75_TON (13, "Cargo Truck, up to 7.5 Ton"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cargo Truck, up to 10 Ton */
-// autogenerated using string template disenumpart2.txt
-
     CARGO_TRUCK_UP_TO_10_TON (14, "Cargo Truck, up to 10 Ton"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cargo Truck, over 10 Ton */
-// autogenerated using string template disenumpart2.txt
-
     CARGO_TRUCK_OVER_10_TON (15, "Cargo Truck, over 10 Ton"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tanker */
-// autogenerated using string template disenumpart2.txt
-
     TANKER (20, "Tanker"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Semi-Trailer Cab (w/o Trailer) */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Semi-Trailer Cab (w/o Trailer)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Van */
-// autogenerated using string template disenumpart2.txt
-
     VAN (70, "Van"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Van, Extended */
-// autogenerated using string template disenumpart2.txt
-
     VAN_EXTENDED (71, "Van, Extended"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Van, Compact */
-// autogenerated using string template disenumpart2.txt
-
     VAN_COMPACT (72, "Van, Compact"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Van, Wheelchair */
-// autogenerated using string template disenumpart2.txt
-
     VAN_WHEELCHAIR (73, "Van, Wheelchair"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Van, Delivery */
-// autogenerated using string template disenumpart2.txt
-
     VAN_DELIVERY (74, "Van, Delivery"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Delivery Truck */
-// autogenerated using string template disenumpart2.txt
-
     DELIVERY_TRUCK (100, "Delivery Truck"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Delivery Truck, Box */
-// autogenerated using string template disenumpart2.txt
-
     DELIVERY_TRUCK_BOX (101, "Delivery Truck, Box"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Delivery Truck, Flatbed */
-// autogenerated using string template disenumpart2.txt
-
     DELIVERY_TRUCK_FLATBED (102, "Delivery Truck, Flatbed"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Delivery Truck, Stake Bed */
-// autogenerated using string template disenumpart2.txt
-
     DELIVERY_TRUCK_STAKE_BED (103, "Delivery Truck, Stake Bed"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mess Truck */
-// autogenerated using string template disenumpart2.txt
-
     MESS_TRUCK (104, "Mess Truck"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Truck, Palletised Load System (PLS), https://en.wikipedia.org/wiki/Palletized_load_system */
-// autogenerated using string template disenumpart2.txt
-
     TRUCK_PALLETISED_LOAD_SYSTEM_PLS (105, "Truck, Palletised Load System (PLS)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Truck, Petroleum, Oil, and Lubricants (POL) Palletised Load System (PLS) */
-// autogenerated using string template disenumpart2.txt
-
     TRUCK_PETROLEUM_OIL_AND_LUBRICANTS_POL_PALLETISED_LOAD_SYSTEM_PLS (106, "Truck, Petroleum, Oil, and Lubricants (POL) Palletised Load System (PLS)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Truck, Petroleum, Oil, and Lubricants (POL), Surveillance */
-// autogenerated using string template disenumpart2.txt
-
     TRUCK_PETROLEUM_OIL_AND_LUBRICANTS_POL_SURVEILLANCE (107, "Truck, Petroleum, Oil, and Lubricants (POL), Surveillance"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Refrigerated Truck, Small */
-// autogenerated using string template disenumpart2.txt
-
     REFRIGERATED_TRUCK_SMALL (108, "Refrigerated Truck, Small"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Refrigerated Truck, Medium */
-// autogenerated using string template disenumpart2.txt
-
     REFRIGERATED_TRUCK_MEDIUM (109, "Refrigerated Truck, Medium"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Refrigerated Truck, Large */
-// autogenerated using string template disenumpart2.txt
-
-    REFRIGERATED_TRUCK_LARGE (110, "Refrigerated Truck, Large"),;
-
-// autogenerated using string template disenumpart25.txt
+    REFRIGERATED_TRUCK_LARGE (110, "Refrigerated Truck, Large");
 
     private int value;
     private final String description;
@@ -261,8 +129,6 @@ public enum PlatformLandSingleUnitCargoTruckSubcategories implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java
index 8882a0ffeb29b879202237231f3f6ea27a4c4012..3ab9a8ead80a8557cf9a832326747f8cc03f8f1f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java
@@ -7,289 +7,105 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 431, marshal size 8,
- * PlatformLandSingleUnitUtilityEmergencyTruckSubcategories
+ * Generated from XML, <br>
+ * UID 431 marshal size 8<br>
+ * PlatformLandSingleUnitUtilityEmergencyTruckSubcategories<br>
  * Subcategories for Land Platform Category 84
  */
 public enum PlatformLandSingleUnitUtilityEmergencyTruckSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ambulance Truck */
-// autogenerated using string template disenumpart2.txt
-
     AMBULANCE_TRUCK (1, "Ambulance Truck"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fire/Paramedic Truck */
-// autogenerated using string template disenumpart2.txt
-
     FIRE_PARAMEDIC_TRUCK (2, "Fire/Paramedic Truck"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ambulance, Advanced Life Support */
-// autogenerated using string template disenumpart2.txt
-
     AMBULANCE_ADVANCED_LIFE_SUPPORT (3, "Ambulance, Advanced Life Support"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ambulance Pickup Truck */
-// autogenerated using string template disenumpart2.txt
-
     AMBULANCE_PICKUP_TRUCK (4, "Ambulance Pickup Truck"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fire Engine */
-// autogenerated using string template disenumpart2.txt
-
     FIRE_ENGINE (10, "Fire Engine"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Aerial Ladder Fire Engine */
-// autogenerated using string template disenumpart2.txt
-
     AERIAL_LADDER_FIRE_ENGINE (11, "Aerial Ladder Fire Engine"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Airport Fire Engine */
-// autogenerated using string template disenumpart2.txt
-
     AIRPORT_FIRE_ENGINE (12, "Airport Fire Engine"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Wildland Fire Engine */
-// autogenerated using string template disenumpart2.txt
-
     WILDLAND_FIRE_ENGINE (13, "Wildland Fire Engine"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fire Chief */
-// autogenerated using string template disenumpart2.txt
-
     FIRE_CHIEF (14, "Fire Chief"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Police Paddy Wagon */
-// autogenerated using string template disenumpart2.txt
-
     POLICE_PADDY_WAGON (20, "Police Paddy Wagon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Police, SWAT */
-// autogenerated using string template disenumpart2.txt
-
     POLICE_SWAT (21, "Police, SWAT"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Police, Bomb Squad */
-// autogenerated using string template disenumpart2.txt
-
     POLICE_BOMB_SQUAD (22, "Police, Bomb Squad"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Police, Pickup Truck */
-// autogenerated using string template disenumpart2.txt
-
     POLICE_PICKUP_TRUCK (23, "Police, Pickup Truck"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hazmat */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Hazmat"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Wrecker, Normal Hook and Chain */
-// autogenerated using string template disenumpart2.txt
-
     WRECKER_NORMAL_HOOK_AND_CHAIN (40, "Wrecker, Normal Hook and Chain"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Wrecker, Normal Boom */
-// autogenerated using string template disenumpart2.txt
-
     WRECKER_NORMAL_BOOM (41, "Wrecker, Normal Boom"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Wrecker, Normal Wheel Lift */
-// autogenerated using string template disenumpart2.txt
-
     WRECKER_NORMAL_WHEEL_LIFT (42, "Wrecker, Normal Wheel Lift"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Wrecker, Normal Flatbed */
-// autogenerated using string template disenumpart2.txt
-
     WRECKER_NORMAL_FLATBED (43, "Wrecker, Normal Flatbed"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Wrecker, Normal Integrated */
-// autogenerated using string template disenumpart2.txt
-
     WRECKER_NORMAL_INTEGRATED (44, "Wrecker, Normal Integrated"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Wrecker, Heavy Hook and Chain */
-// autogenerated using string template disenumpart2.txt
-
     WRECKER_HEAVY_HOOK_AND_CHAIN (45, "Wrecker, Heavy Hook and Chain"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Wrecker, Heavy Boom */
-// autogenerated using string template disenumpart2.txt
-
     TIME_SPACE_POSITION_INFORMATION (46, "Wrecker, Heavy Boom"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Wrecker, Heavy Wheel Lift */
-// autogenerated using string template disenumpart2.txt
-
     WRECKER_HEAVY_WHEEL_LIFT (47, "Wrecker, Heavy Wheel Lift"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Wrecker, Heavy Flatbed */
-// autogenerated using string template disenumpart2.txt
-
     WRECKER_HEAVY_FLATBED (48, "Wrecker, Heavy Flatbed"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Wrecker, Heavy Integrated */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_FIRE (49, "Wrecker, Heavy Integrated"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Postal Truck */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "Postal Truck"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Street Sweeper */
-// autogenerated using string template disenumpart2.txt
-
     STREET_SWEEPER (70, "Street Sweeper"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Street Sweeper, Three Wheeled */
-// autogenerated using string template disenumpart2.txt
-
     STREET_SWEEPER_THREE_WHEELED (71, "Street Sweeper, Three Wheeled"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Waste Collection, Other */
-// autogenerated using string template disenumpart2.txt
-
     WASTE_COLLECTION_OTHER (80, "Waste Collection, Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Waste Collection, Front Loader */
-// autogenerated using string template disenumpart2.txt
-
     WASTE_COLLECTION_FRONT_LOADER (81, "Waste Collection, Front Loader"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Waste Collection, Rear Loader */
-// autogenerated using string template disenumpart2.txt
-
     WASTE_COLLECTION_REAR_LOADER (82, "Waste Collection, Rear Loader"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Waste Collection, Automated Side Loader */
-// autogenerated using string template disenumpart2.txt
-
     WASTE_COLLECTION_AUTOMATED_SIDE_LOADER (83, "Waste Collection, Automated Side Loader"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Waste Collection, Pneumatic Collection */
-// autogenerated using string template disenumpart2.txt
-
     WASTE_COLLECTION_PNEUMATIC_COLLECTION (84, "Waste Collection, Pneumatic Collection"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Waste Collection, Grapple */
-// autogenerated using string template disenumpart2.txt
-
     WASTE_COLLECTION_GRAPPLE (85, "Waste Collection, Grapple"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Utility Truck */
-// autogenerated using string template disenumpart2.txt
-
     UTILITY_TRUCK (90, "Utility Truck"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Utility Truck w/ Boom */
-// autogenerated using string template disenumpart2.txt
-
     UTILITY_TRUCK_W_BOOM (91, "Utility Truck w/ Boom"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Aerial Work Platform, Other */
-// autogenerated using string template disenumpart2.txt
-
     AERIAL_WORK_PLATFORM_OTHER (100, "Aerial Work Platform, Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Aerial Work Platform, Scissor Lift */
-// autogenerated using string template disenumpart2.txt
-
     AERIAL_WORK_PLATFORM_SCISSOR_LIFT (101, "Aerial Work Platform, Scissor Lift"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Aerial Work Platform, Telescoping */
-// autogenerated using string template disenumpart2.txt
-
     AERIAL_WORK_PLATFORM_TELESCOPING (102, "Aerial Work Platform, Telescoping"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Maintenance Truck */
-// autogenerated using string template disenumpart2.txt
-
     MAINTENANCE_TRUCK (120, "Maintenance Truck"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Decontamination Truck */
-// autogenerated using string template disenumpart2.txt
-
     DECONTAMINATION_TRUCK (121, "Decontamination Truck"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Water Cannon Truck */
-// autogenerated using string template disenumpart2.txt
-
     WATER_CANNON_TRUCK (122, "Water Cannon Truck"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Water Purification Truck */
-// autogenerated using string template disenumpart2.txt
-
     WATER_PURIFICATION_TRUCK (123, "Water Purification Truck"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Smoke Generator Truck */
-// autogenerated using string template disenumpart2.txt
-
     SMOKE_GENERATOR_TRUCK (124, "Smoke Generator Truck"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Auto Rickshaw */
-// autogenerated using string template disenumpart2.txt
-
-    AUTO_RICKSHAW (150, "Auto Rickshaw"),;
-
-// autogenerated using string template disenumpart25.txt
+    AUTO_RICKSHAW (150, "Auto Rickshaw");
 
     private int value;
     private final String description;
@@ -339,8 +155,6 @@ public enum PlatformLandSingleUnitUtilityEmergencyTruckSubcategories implements
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrailerSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrailerSubcategories.java
index af267fef92f6de590735d35dc0d021c0a876d569..be70876c4b44206cadcd22f079cc2a2bbb115a50 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrailerSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrailerSubcategories.java
@@ -7,187 +7,71 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 436, marshal size 8,
- * PlatformLandTrailerSubcategories
+ * Generated from XML, <br>
+ * UID 436 marshal size 8<br>
+ * PlatformLandTrailerSubcategories<br>
  * Subcategories for Land Platform Category 89
  */
 public enum PlatformLandTrailerSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Flatbed */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_FLATBED (1, "Trailer, Flatbed"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Container */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_CONTAINER (2, "Trailer, Container"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Container, Refrigerated */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_CONTAINER_REFRIGERATED (3, "Trailer, Container, Refrigerated"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Double */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_DOUBLE (4, "Trailer, Double"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Auto Transport */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_AUTO_TRANSPORT (5, "Trailer, Auto Transport"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Articulated */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_ARTICULATED (6, "Trailer, Articulated"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Tanker */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_TANKER (7, "Trailer, Tanker"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Tanker, Small */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_TANKER_SMALL (8, "Trailer, Tanker, Small"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Tanker, Large */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_TANKER_LARGE (9, "Trailer, Tanker, Large"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Tanker, Gasoline */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_TANKER_GASOLINE (10, "Trailer, Tanker, Gasoline"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Tanker, Milk */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_TANKER_MILK (11, "Trailer, Tanker, Milk"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Tanker, Water */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_TANKER_WATER (12, "Trailer, Tanker, Water"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Tanker, Septic */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_TANKER_SEPTIC (13, "Trailer, Tanker, Septic"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Boat */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_BOAT (14, "Trailer, Boat"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Boat, Small */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_BOAT_SMALL (15, "Trailer, Boat, Small"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Boat, Large */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_BOAT_LARGE (16, "Trailer, Boat, Large"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Recreational */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_RECREATIONAL (17, "Trailer, Recreational"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Recreational, Conventional */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_RECREATIONAL_CONVENTIONAL (18, "Trailer, Recreational, Conventional"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Recreational, Travel Expandable */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_RECREATIONAL_TRAVEL_EXPANDABLE (19, "Trailer, Recreational, Travel Expandable"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Recreational, Fifth Wheel Travel */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_RECREATIONAL_FIFTH_WHEEL_TRAVEL (20, "Trailer, Recreational, Fifth Wheel Travel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Recreational, Folding Camping */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_RECREATIONAL_FOLDING_CAMPING (21, "Trailer, Recreational, Folding Camping"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Recreational, Truck Camper */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_RECREATIONAL_TRUCK_CAMPER (22, "Trailer, Recreational, Truck Camper"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Aerostat Mooring Platform */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_AEROSTAT_MOORING_PLATFORM (23, "Trailer, Aerostat Mooring Platform"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Household */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_HOUSEHOLD (24, "Trailer, Household"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Kitchen */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_KITCHEN (25, "Trailer, Kitchen"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, UltraLight Aircraft */
-// autogenerated using string template disenumpart2.txt
-
     TRAILER_ULTRALIGHT_AIRCRAFT (26, "Trailer, UltraLight Aircraft"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Trailer, Heavy Equipment */
-// autogenerated using string template disenumpart2.txt
-
-    TRAILER_HEAVY_EQUIPMENT (27, "Trailer, Heavy Equipment"),;
-
-// autogenerated using string template disenumpart25.txt
+    TRAILER_HEAVY_EQUIPMENT (27, "Trailer, Heavy Equipment");
 
     private int value;
     private final String description;
@@ -237,8 +121,6 @@ public enum PlatformLandTrailerSubcategories implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrainsSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrainsSubcategories.java
index f3cc7760f4085123dc55b81a2300e349ebffe96a..ff10d7db3a1f93758f580dffefdc0a83f6a3b638 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrainsSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrainsSubcategories.java
@@ -7,67 +7,31 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 439, marshal size 8,
- * PlatformLandTrainsSubcategories
+ * Generated from XML, <br>
+ * UID 439 marshal size 8<br>
+ * PlatformLandTrainsSubcategories<br>
  * Subcategories for Land Platform Category 92
  */
 public enum PlatformLandTrainsSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Engine (Locomotive) */
-// autogenerated using string template disenumpart2.txt
-
     ENGINE_LOCOMOTIVE (1, "Engine (Locomotive)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Box Car */
-// autogenerated using string template disenumpart2.txt
-
     BOX_CAR (2, "Box Car"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tanker */
-// autogenerated using string template disenumpart2.txt
-
     TANKER (3, "Tanker"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Flatcar */
-// autogenerated using string template disenumpart2.txt
-
     FLATCAR (4, "Flatcar"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Caboose */
-// autogenerated using string template disenumpart2.txt
-
     CABOOSE (5, "Caboose"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Passenger Car */
-// autogenerated using string template disenumpart2.txt
-
     PASSENGER_CAR (6, "Passenger Car"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hopper */
-// autogenerated using string template disenumpart2.txt
-
-    HOPPER (7, "Hopper"),;
-
-// autogenerated using string template disenumpart25.txt
+    HOPPER (7, "Hopper");
 
     private int value;
     private final String description;
@@ -117,8 +81,6 @@ public enum PlatformLandTrainsSubcategories implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java
index de993d281e06686e9240fcc610b5708ba933037d..095bca8ee7ce857f88ae49cf84e9565fb8640762 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java
@@ -7,55 +7,27 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 440, marshal size 8,
- * PlatformLandUtilityEmergencyCarSubcategories
+ * Generated from XML, <br>
+ * UID 440 marshal size 8<br>
+ * PlatformLandUtilityEmergencyCarSubcategories<br>
  * Subcategories for Land Platform Category 93
  */
 public enum PlatformLandUtilityEmergencyCarSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ambulance Car */
-// autogenerated using string template disenumpart2.txt
-
     AMBULANCE_CAR (1, "Ambulance Car"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Police Car */
-// autogenerated using string template disenumpart2.txt
-
     POLICE_CAR (2, "Police Car"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Police Chief */
-// autogenerated using string template disenumpart2.txt
-
     POLICE_CHIEF (3, "Police Chief"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hearse */
-// autogenerated using string template disenumpart2.txt
-
     HEARSE (4, "Hearse"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Taxi */
-// autogenerated using string template disenumpart2.txt
-
-    TAXI (5, "Taxi"),;
-
-// autogenerated using string template disenumpart25.txt
+    TAXI (5, "Taxi");
 
     private int value;
     private final String description;
@@ -105,8 +77,6 @@ public enum PlatformLandUtilityEmergencyCarSubcategories implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSpaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSpaceCategory.java
index 24af89a2dc26c1e7fd648135e3d2d10a91c21be4..0bc87b1a203e06383d55fe3b40b2181508d98d45 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSpaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSpaceCategory.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 13,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 13 marshal size 8<br>
  * PlatformSpaceCategory
  */
 public enum PlatformSpaceCategory implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Manned */
-// autogenerated using string template disenumpart2.txt
-
     MANNED (1, "Manned"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Unmanned */
-// autogenerated using string template disenumpart2.txt
-
     UNMANNED (2, "Unmanned"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Booster */
-// autogenerated using string template disenumpart2.txt
-
-    BOOSTER (3, "Booster"),;
-
-// autogenerated using string template disenumpart25.txt
+    BOOSTER (3, "Booster");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum PlatformSpaceCategory implements Category
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCategory.java
index 8525d44868f22c58831b185b3b02e4e743af1571..3bb0f9f8e80677b8b82db5d0e445ef899f92b843 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCategory.java
@@ -7,138 +7,53 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 12,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 12 marshal size 8<br>
  * PlatformSubsurfaceCategory
  */
 public enum PlatformSubsurfaceCategory implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SSBN (Nuclear Ballistic Missile) */
-// autogenerated using string template disenumpart2.txt
-
     SSBN_NUCLEAR_BALLISTIC_MISSILE (1, "SSBN (Nuclear Ballistic Missile)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SSGN (Nuclear Guided Missile) */
-// autogenerated using string template disenumpart2.txt
-
     SSGN_NUCLEAR_GUIDED_MISSILE (2, "SSGN (Nuclear Guided Missile)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SSN (Nuclear Attack - Torpedo) */
-// autogenerated using string template disenumpart2.txt
-
     SSN_NUCLEAR_ATTACK_TORPEDO (3, "SSN (Nuclear Attack - Torpedo)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SSG (Conventional Guided Missile) */
-// autogenerated using string template disenumpart2.txt
-
     SSG_CONVENTIONAL_GUIDED_MISSILE (4, "SSG (Conventional Guided Missile)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SS (Conventional Attack - Torpedo, Patrol) */
-// autogenerated using string template disenumpart2.txt
-
     SS_CONVENTIONAL_ATTACK_TORPEDO_PATROL (5, "SS (Conventional Attack - Torpedo, Patrol)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SSAN (Nuclear Auxiliary) */
-// autogenerated using string template disenumpart2.txt
-
     SSAN_NUCLEAR_AUXILIARY (6, "SSAN (Nuclear Auxiliary)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SSA (Conventional Auxiliary) */
-// autogenerated using string template disenumpart2.txt
-
     SSA_CONVENTIONAL_AUXILIARY (7, "SSA (Conventional Auxiliary)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Unmanned Underwater Vehicle (UUV) */
-// autogenerated using string template disenumpart2.txt
-
     UNMANNED_UNDERWATER_VEHICLE_UUV (8, "Unmanned Underwater Vehicle (UUV)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SSB (Submarine Ballistic, Ballistic Missile Submarine) */
-// autogenerated using string template disenumpart2.txt
-
     SSB_SUBMARINE_BALLISTIC_BALLISTIC_MISSILE_SUBMARINE (9, "SSB (Submarine Ballistic, Ballistic Missile Submarine)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SSC (Coastal Submarine, over 150 tons) */
-// autogenerated using string template disenumpart2.txt
-
     SSC_COASTAL_SUBMARINE_OVER_150_TONS (10, "SSC (Coastal Submarine, over 150 tons)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SSP (Attack Submarine - Diesel Air-Independent Propulsion) */
-// autogenerated using string template disenumpart2.txt
-
     SSP_ATTACK_SUBMARINE_DIESEL_AIR_INDEPENDENT_PROPULSION (11, "SSP (Attack Submarine - Diesel Air-Independent Propulsion)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SSM (Midget Submarine, under 150 tons) */
-// autogenerated using string template disenumpart2.txt
-
     SSM_MIDGET_SUBMARINE_UNDER_150_TONS (12, "SSM (Midget Submarine, under 150 tons)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SSNR (Special Attack Submarine) */
-// autogenerated using string template disenumpart2.txt
-
     SSNR_SPECIAL_ATTACK_SUBMARINE (13, "SSNR (Special Attack Submarine)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SST (Training Submarine) */
-// autogenerated using string template disenumpart2.txt
-
     SST_TRAINING_SUBMARINE (14, "SST (Training Submarine)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** AGSS (Auxiliary Submarine) */
-// autogenerated using string template disenumpart2.txt
-
     AGSS_AUXILIARY_SUBMARINE (15, "AGSS (Auxiliary Submarine)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Semi-Submersible Boats */
-// autogenerated using string template disenumpart2.txt
-
     SEMI_SUBMERSIBLE_BOATS (16, "Semi-Submersible Boats"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Civilian Submarines */
-// autogenerated using string template disenumpart2.txt
-
     CIVILIAN_SUBMARINES (80, "Civilian Submarines"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Civilian Submersibles */
-// autogenerated using string template disenumpart2.txt
-
     CIVILIAN_SUBMERSIBLES (81, "Civilian Submersibles"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Civilian Semi-Submersible Boats */
-// autogenerated using string template disenumpart2.txt
-
-    CIVILIAN_SEMI_SUBMERSIBLE_BOATS (82, "Civilian Semi-Submersible Boats"),;
-
-// autogenerated using string template disenumpart25.txt
+    CIVILIAN_SEMI_SUBMERSIBLE_BOATS (82, "Civilian Semi-Submersible Boats");
 
     private int value;
     private final String description;
@@ -188,8 +103,6 @@ public enum PlatformSubsurfaceCategory implements Category
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java
index 984a37cd99076957b4b55f7e339ba9d74ae736e3..2fd0b582a8e80fa4b569d5c8ea64835c510ecfa3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java
@@ -7,25 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 508, marshal size 8,
- * PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories
+ * Generated from XML, <br>
+ * UID 508 marshal size 8<br>
+ * PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories<br>
  * Subcategories for Subsurface Platform Category 82
  */
 public enum PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Narco-Submarine */
-// autogenerated using string template disenumpart2.txt
-
-    NARCO_SUBMARINE (1, "Narco-Submarine"),;
-
-// autogenerated using string template disenumpart25.txt
+    NARCO_SUBMARINE (1, "Narco-Submarine");
 
     private int value;
     private final String description;
@@ -75,8 +67,6 @@ public enum PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories implements S
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java
index 3b311457558f51cbcc4a481382f65e4f382b7935..72c26a69c65feb87a5f8bcb3db91be849232d20d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java
@@ -7,24 +7,18 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 506, marshal size 8,
- * PlatformSubsurfaceCivilianSubmarineSubcategories
+ * Generated from XML, <br>
+ * UID 506 marshal size 8<br>
+ * PlatformSubsurfaceCivilianSubmarineSubcategories<br>
  * Subcategories for Subsurface Platform Category 80
  */
 public enum PlatformSubsurfaceCivilianSubmarineSubcategories implements SubCategory
 {
 
-   /** Constructor initialization */// autogenerated using string template disenumpart2.txt
-
-    SELF (0, "PlatformSubsurfaceCivilianSubmarineSubcategories details not found in SISO spec"),
+   /** Constructor initialization */    SELF (0, "PlatformSubsurfaceCivilianSubmarineSubcategories details not found in SISO spec"),
 ;
 
-// autogenerated using string template disenumpart25.txt
-
     private int value;
     private final String description;
 
@@ -73,8 +67,6 @@ public enum PlatformSubsurfaceCivilianSubmarineSubcategories implements SubCateg
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java
index 30ebd2527efc1cd8613cabb81d0eb6d66340bbf4..a55b7ab9a6186f8e46f423c1445ef882361ad753 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java
@@ -7,24 +7,18 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 507, marshal size 8,
- * PlatformSubsurfaceCivilianSubmersibleSubcategories
+ * Generated from XML, <br>
+ * UID 507 marshal size 8<br>
+ * PlatformSubsurfaceCivilianSubmersibleSubcategories<br>
  * Subcategories for Subsurface Platform Category 81
  */
 public enum PlatformSubsurfaceCivilianSubmersibleSubcategories implements SubCategory
 {
 
-   /** Constructor initialization */// autogenerated using string template disenumpart2.txt
-
-    SELF (0, "PlatformSubsurfaceCivilianSubmersibleSubcategories details not found in SISO spec"),
+   /** Constructor initialization */    SELF (0, "PlatformSubsurfaceCivilianSubmersibleSubcategories details not found in SISO spec"),
 ;
 
-// autogenerated using string template disenumpart25.txt
-
     private int value;
     private final String description;
 
@@ -73,8 +67,6 @@ public enum PlatformSubsurfaceCivilianSubmersibleSubcategories implements SubCat
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceCategory.java
index b69dd487a3fd106909d12ab825fff67adae2e71e..4731c1f7e11bca1c13f94e4f29a2e56db881360a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceCategory.java
@@ -7,291 +7,98 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 11,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 11 marshal size 8<br>
  * PlatformSurfaceCategory
  */
 public enum PlatformSurfaceCategory implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Carrier */
-// autogenerated using string template disenumpart2.txt
-
     CARRIER (1, "Carrier"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Command Ship/Cruiser */
-// autogenerated using string template disenumpart2.txt
-
     COMMAND_SHIP_CRUISER (2, "Command Ship/Cruiser"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Guided Missile Cruiser */
-// autogenerated using string template disenumpart2.txt
-
     GUIDED_MISSILE_CRUISER (3, "Guided Missile Cruiser"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Guided Missile Destroyer (DDG) */
-// autogenerated using string template disenumpart2.txt
-
     GUIDED_MISSILE_DESTROYER_DDG (4, "Guided Missile Destroyer (DDG)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Destroyer (DD) */
-// autogenerated using string template disenumpart2.txt
-
     DESTROYER_DD (5, "Destroyer (DD)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Guided Missile Frigate (FFG) */
-// autogenerated using string template disenumpart2.txt
-
     GUIDED_MISSILE_FRIGATE_FFG (6, "Guided Missile Frigate (FFG)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light/Patrol Craft */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT_PATROL_CRAFT (7, "Light/Patrol Craft"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mine Countermeasure Ship/Craft */
-// autogenerated using string template disenumpart2.txt
-
     MINE_COUNTERMEASURE_SHIP_CRAFT (8, "Mine Countermeasure Ship/Craft"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dock Landing Ship */
-// autogenerated using string template disenumpart2.txt
-
     DOCK_LANDING_SHIP (9, "Dock Landing Ship"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tank Landing Ship */
-// autogenerated using string template disenumpart2.txt
-
     TANK_LANDING_SHIP (10, "Tank Landing Ship"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Landing Craft */
-// autogenerated using string template disenumpart2.txt
-
     LANDING_CRAFT (11, "Landing Craft"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Light Carrier */
-// autogenerated using string template disenumpart2.txt
-
     LIGHT_CARRIER (12, "Light Carrier"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cruiser/Helicopter Carrier */
-// autogenerated using string template disenumpart2.txt
-
     CRUISER_HELICOPTER_CARRIER (13, "Cruiser/Helicopter Carrier"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hydrofoil */
-// autogenerated using string template disenumpart2.txt
-
     HYDROFOIL (14, "Hydrofoil"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Air Cushion/Surface Effect */
-// autogenerated using string template disenumpart2.txt
-
     AIR_CUSHION_SURFACE_EFFECT (15, "Air Cushion/Surface Effect"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Auxiliary */
-// autogenerated using string template disenumpart2.txt
-
     AUXILIARY (16, "Auxiliary"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Auxiliary, Merchant Marine */
-// autogenerated using string template disenumpart2.txt
-
     AUXILIARY_MERCHANT_MARINE (17, "Auxiliary, Merchant Marine"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Utility */
-// autogenerated using string template disenumpart2.txt
-
     UTILITY (18, "Utility"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Unmanned Surface Vehicle (USV) */
-// autogenerated using string template disenumpart2.txt
-
     UNMANNED_SURFACE_VEHICLE_USV (19, "Unmanned Surface Vehicle (USV)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Littoral Combat Ships (LCS) */
-// autogenerated using string template disenumpart2.txt
-
     LITTORAL_COMBAT_SHIPS_LCS (20, "Littoral Combat Ships (LCS)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Surveillance Ship */
-// autogenerated using string template disenumpart2.txt
-
     SURVEILLANCE_SHIP (21, "Surveillance Ship"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Frigate (including Corvette) */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "Frigate (including Corvette)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Battleship */
-// autogenerated using string template disenumpart2.txt
-
     CREATE_ENTITY_RELIABLE (51, "Battleship"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Heavy Cruiser */
-// autogenerated using string template disenumpart2.txt
-
     REMOVE_ENTITY_RELIABLE (52, "Heavy Cruiser"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Destroyer Tender */
-// autogenerated using string template disenumpart2.txt
-
     START_RESUME_RELIABLE (53, "Destroyer Tender"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Amphibious Assault Ship */
-// autogenerated using string template disenumpart2.txt
-
     STOP_FREEZE_RELIABLE (54, "Amphibious Assault Ship"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Amphibious Cargo Ship */
-// autogenerated using string template disenumpart2.txt
-
     ACKNOWLEDGE_RELIABLE (55, "Amphibious Cargo Ship"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Amphibious Transport Dock */
-// autogenerated using string template disenumpart2.txt
-
     ACTION_REQUEST_RELIABLE (56, "Amphibious Transport Dock"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ammunition Ship */
-// autogenerated using string template disenumpart2.txt
-
     ACTION_RESPONSE_RELIABLE (57, "Ammunition Ship"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Combat Stores Ship */
-// autogenerated using string template disenumpart2.txt
-
     DATA_QUERY_RELIABLE (58, "Combat Stores Ship"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Surveillance Towed Array Sonar System (SURTASS) */
-// autogenerated using string template disenumpart2.txt
-
     SET_DATA_RELIABLE (59, "Surveillance Towed Array Sonar System (SURTASS)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fast Combat Support Ship */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "Fast Combat Support Ship"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Non-Combatant Ship */
-// autogenerated using string template disenumpart2.txt
-
     EVENT_REPORT_RELIABLE (61, "Non-Combatant Ship"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Coast Guard Cutters */
-// autogenerated using string template disenumpart2.txt
-
     COMMENT_RELIABLE (62, "Coast Guard Cutters"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Coast Guard Boats */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_RELIABLE (63, "Coast Guard Boats"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fast Attack Craft */
-// autogenerated using string template disenumpart2.txt
-
     SET_RECORD_RELIABLE	 (64, "Fast Attack Craft"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformSurfacePassengerVesselSubcategories */// autogenerated using string template disenumpart21.txt
-
-    PASSENGER_VESSEL_GROUP_1_MERCHANT_2 (80, "Passenger Vessel (Group 1 Merchant)"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformSurfaceDryCargoShipSubcategories */// autogenerated using string template disenumpart21.txt
-
-    DRY_CARGO_SHIP_GROUP_2_MERCHANT_2 (81, "Dry Cargo Ship (Group 2 Merchant)"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformSurfaceTankerSubcategories */// autogenerated using string template disenumpart21.txt
-
-    TANKER_GROUP_3_MERCHANT_2 (82, "Tanker (Group 3 Merchant)"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformSurfaceSupportVesselSubcategories */// autogenerated using string template disenumpart21.txt
-
-    SUPPORT_VESSEL_2 (83, "Support Vessel"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformSurfacePrivateMotorboatSubcategories */// autogenerated using string template disenumpart21.txt
-
-    PRIVATE_MOTORBOAT_2 (84, "Private Motorboat"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformSurfacePrivateSailboatSubcategories */// autogenerated using string template disenumpart21.txt
-
-    PRIVATE_SAILBOAT_2 (85, "Private Sailboat"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformSurfaceFishingVesselSubcategories */// autogenerated using string template disenumpart21.txt
-
-    FISHING_VESSEL_2 (86, "Fishing Vessel"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** PlatformSurfaceOtherVesselsSubcategories */// autogenerated using string template disenumpart21.txt
-
-    OTHER_VESSELS_2 (87, "Other Vessels"),
-// autogenerated using string template disenumfootnotecomment.txt
-
+    /** PlatformSurfacePassengerVesselSubcategories */    PASSENGER_VESSEL_GROUP_1_MERCHANT_2 (80, "Passenger Vessel (Group 1 Merchant)"),
+    /** PlatformSurfaceDryCargoShipSubcategories */    DRY_CARGO_SHIP_GROUP_2_MERCHANT_2 (81, "Dry Cargo Ship (Group 2 Merchant)"),
+    /** PlatformSurfaceTankerSubcategories */    TANKER_GROUP_3_MERCHANT_2 (82, "Tanker (Group 3 Merchant)"),
+    /** PlatformSurfaceSupportVesselSubcategories */    SUPPORT_VESSEL_2 (83, "Support Vessel"),
+    /** PlatformSurfacePrivateMotorboatSubcategories */    PRIVATE_MOTORBOAT_2 (84, "Private Motorboat"),
+    /** PlatformSurfacePrivateSailboatSubcategories */    PRIVATE_SAILBOAT_2 (85, "Private Sailboat"),
+    /** PlatformSurfaceFishingVesselSubcategories */    FISHING_VESSEL_2 (86, "Fishing Vessel"),
+    /** PlatformSurfaceOtherVesselsSubcategories */    OTHER_VESSELS_2 (87, "Other Vessels"),
     /** Search and Rescue Vessels */
-// autogenerated using string template disenumpart2.txt
-
     SEARCH_AND_RESCUE_VESSELS (100, "Search and Rescue Vessels"),
-// autogenerated using string template disdictenumcomment.txt
-
-    /** LifeSavingEquipment */// autogenerated using string template disenumpart21.txt
-
-    LIFE_SAVING_EQUIPMENT_2 (101, "Life-Saving Equipment"),;
-
-// autogenerated using string template disenumpart25.txt
+    /** LifeSavingEquipment */    LIFE_SAVING_EQUIPMENT_2 (101, "Life-Saving Equipment");
 
     private int value;
     private final String description;
@@ -341,8 +148,6 @@ public enum PlatformSurfaceCategory implements Category
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceDryCargoShipSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceDryCargoShipSubcategories.java
index 70d64de74c52cf5b358c57a2f617ca3a3716c041..3597ab7d5efa29f88662063042125ff69ab62265 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceDryCargoShipSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceDryCargoShipSubcategories.java
@@ -7,61 +7,29 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 442, marshal size 8,
- * PlatformSurfaceDryCargoShipSubcategories
+ * Generated from XML, <br>
+ * UID 442 marshal size 8<br>
+ * PlatformSurfaceDryCargoShipSubcategories<br>
  * Subcategories for Surface Platform Category 81.
  */
 public enum PlatformSurfaceDryCargoShipSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Common Dry Cargo Ship */
-// autogenerated using string template disenumpart2.txt
-
     COMMON_DRY_CARGO_SHIP (1, "Common Dry Cargo Ship"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dry Bulk Cargo Ship */
-// autogenerated using string template disenumpart2.txt
-
     DRY_BULK_CARGO_SHIP (2, "Dry Bulk Cargo Ship"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Container Ship */
-// autogenerated using string template disenumpart2.txt
-
     CONTAINER_SHIP (3, "Container Ship"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Reefer Ship (Refrigerator Ship) */
-// autogenerated using string template disenumpart2.txt
-
     REEFER_SHIP_REFRIGERATOR_SHIP (4, "Reefer Ship (Refrigerator Ship)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ro-Ro Ship (Roll-on/Roll-off Ship) */
-// autogenerated using string template disenumpart2.txt
-
     RO_RO_SHIP_ROLL_ON_ROLL_OFF_SHIP (5, "Ro-Ro Ship (Roll-on/Roll-off Ship)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Barge */
-// autogenerated using string template disenumpart2.txt
-
     BARGE (6, "Barge"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Heavy Lift Ship */
-// autogenerated using string template disenumpart2.txt
-
-    HEAVY_LIFT_SHIP (7, "Heavy Lift Ship"),;
-
-// autogenerated using string template disenumpart25.txt
+    HEAVY_LIFT_SHIP (7, "Heavy Lift Ship");
 
     private int value;
     private final String description;
@@ -111,8 +79,6 @@ public enum PlatformSurfaceDryCargoShipSubcategories implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceFishingVesselSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceFishingVesselSubcategories.java
index c7d113e662a1a83714407bef00ee29b16ed60a4e..fc5432b699f259ac0abe2621b00bc33869fd9a78 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceFishingVesselSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceFishingVesselSubcategories.java
@@ -7,49 +7,25 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 447, marshal size 8,
- * PlatformSurfaceFishingVesselSubcategories
+ * Generated from XML, <br>
+ * UID 447 marshal size 8<br>
+ * PlatformSurfaceFishingVesselSubcategories<br>
  * Subcategories for Surface Platform Category 86.
  */
 public enum PlatformSurfaceFishingVesselSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Small Fishing Vessel (up to 26ft/7.9m) */
-// autogenerated using string template disenumpart2.txt
-
     SMALL_FISHING_VESSEL_UP_TO_26FT_79M (1, "Small Fishing Vessel (up to 26ft/7.9m)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium Fishing Vessel (up to 65ft/19.8m) */
-// autogenerated using string template disenumpart2.txt
-
     MEDIUM_FISHING_VESSEL_UP_TO_65FT_198M (2, "Medium Fishing Vessel (up to 65ft/19.8m)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Large Fishing Vessel (greater than 65ft/19.8m) */
-// autogenerated using string template disenumpart2.txt
-
     LARGE_FISHING_VESSEL_GREATER_THAN_65FT_198M (3, "Large Fishing Vessel (greater than 65ft/19.8m)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fish Processing Vessel */
-// autogenerated using string template disenumpart2.txt
-
     FISH_PROCESSING_VESSEL (4, "Fish Processing Vessel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Masted Fishing Vessel */
-// autogenerated using string template disenumpart2.txt
-
-    MASTED_FISHING_VESSEL (5, "Masted Fishing Vessel"),;
-
-// autogenerated using string template disenumpart25.txt
+    MASTED_FISHING_VESSEL (5, "Masted Fishing Vessel");
 
     private int value;
     private final String description;
@@ -99,8 +75,6 @@ public enum PlatformSurfaceFishingVesselSubcategories implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceOtherVesselsSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceOtherVesselsSubcategories.java
index aba50d3fb0dc9aea28855ae18a7c3bd81e498c54..9c60623e255535814e7ef71670abb9a3ad461c62 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceOtherVesselsSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceOtherVesselsSubcategories.java
@@ -7,79 +7,35 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 448, marshal size 8,
- * PlatformSurfaceOtherVesselsSubcategories
+ * Generated from XML, <br>
+ * UID 448 marshal size 8<br>
+ * PlatformSurfaceOtherVesselsSubcategories<br>
  * Subcategories for Surface Platform Category 87.
  */
 public enum PlatformSurfaceOtherVesselsSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Go-Fast Boat */
-// autogenerated using string template disenumpart2.txt
-
     GO_FAST_BOAT (1, "Go-Fast Boat"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Research Vessel */
-// autogenerated using string template disenumpart2.txt
-
     RESEARCH_VESSEL (2, "Research Vessel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hydrofoil Vessel */
-// autogenerated using string template disenumpart2.txt
-
     HYDROFOIL_VESSEL (3, "Hydrofoil Vessel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cable Layer Vessel */
-// autogenerated using string template disenumpart2.txt
-
     CABLE_LAYER_VESSEL (4, "Cable Layer Vessel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dredger Vessel */
-// autogenerated using string template disenumpart2.txt
-
     DREDGER_VESSEL (5, "Dredger Vessel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Junk/Dhow Vessel */
-// autogenerated using string template disenumpart2.txt
-
     JUNK_DHOW_VESSEL (6, "Junk/Dhow Vessel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Catamaran */
-// autogenerated using string template disenumpart2.txt
-
     CATAMARAN (7, "Catamaran"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pontoon */
-// autogenerated using string template disenumpart2.txt
-
     PONTOON (8, "Pontoon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Personal Water Craft */
-// autogenerated using string template disenumpart2.txt
-
     PERSONAL_WATER_CRAFT (9, "Personal Water Craft"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Refugee Raft */
-// autogenerated using string template disenumpart2.txt
-
-    REFUGEE_RAFT (10, "Refugee Raft"),;
-
-// autogenerated using string template disenumpart25.txt
+    REFUGEE_RAFT (10, "Refugee Raft");
 
     private int value;
     private final String description;
@@ -129,8 +85,6 @@ public enum PlatformSurfaceOtherVesselsSubcategories implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePassengerVesselSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePassengerVesselSubcategories.java
index afcee60c910448907236de67c2d912bbfd58ad71..ee5e131a6cb836e09e94244d572b09dcc05a6f87 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePassengerVesselSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePassengerVesselSubcategories.java
@@ -7,49 +7,25 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 441, marshal size 8,
- * PlatformSurfacePassengerVesselSubcategories
+ * Generated from XML, <br>
+ * UID 441 marshal size 8<br>
+ * PlatformSurfacePassengerVesselSubcategories<br>
  * Subcategories for Surface Platform Category 80.
  */
 public enum PlatformSurfacePassengerVesselSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cruise Ship */
-// autogenerated using string template disenumpart2.txt
-
     CRUISE_SHIP (1, "Cruise Ship"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cruise Ferry */
-// autogenerated using string template disenumpart2.txt
-
     CRUISE_FERRY (2, "Cruise Ferry"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** High Speed Ferry */
-// autogenerated using string template disenumpart2.txt
-
     HIGH_SPEED_FERRY (3, "High Speed Ferry"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ferry */
-// autogenerated using string template disenumpart2.txt
-
     FERRY (4, "Ferry"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ocean Liner */
-// autogenerated using string template disenumpart2.txt
-
-    OCEAN_LINER (5, "Ocean Liner"),;
-
-// autogenerated using string template disenumpart25.txt
+    OCEAN_LINER (5, "Ocean Liner");
 
     private int value;
     private final String description;
@@ -99,8 +75,6 @@ public enum PlatformSurfacePassengerVesselSubcategories implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java
index 498196016bcdfb7928de451abdab055bb26cc1aa..97d9b97d03f6eb95395f53b7897832201f54c04d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java
@@ -7,43 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 445, marshal size 8,
- * PlatformSurfacePrivateMotorboatSubcategories
+ * Generated from XML, <br>
+ * UID 445 marshal size 8<br>
+ * PlatformSurfacePrivateMotorboatSubcategories<br>
  * Subcategories for Surface Platform Category 84.
  */
 public enum PlatformSurfacePrivateMotorboatSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Small Motorboat (up to 26ft/7.9m) */
-// autogenerated using string template disenumpart2.txt
-
     SMALL_MOTORBOAT_UP_TO_26FT_79M (1, "Small Motorboat (up to 26ft/7.9m)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium Motorboat (up to 39ft/11.9m) */
-// autogenerated using string template disenumpart2.txt
-
     MEDIUM_MOTORBOAT_UP_TO_39FT_119M (2, "Medium Motorboat (up to 39ft/11.9m)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Large Motorboat (up to 65ft/19.8m) */
-// autogenerated using string template disenumpart2.txt
-
     LARGE_MOTORBOAT_UP_TO_65FT_198M (3, "Large Motorboat (up to 65ft/19.8m)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Very Large Motorboat (greater than 65ft/19.8m) */
-// autogenerated using string template disenumpart2.txt
-
-    VERY_LARGE_MOTORBOAT_GREATER_THAN_65FT_198M (4, "Very Large Motorboat (greater than 65ft/19.8m)"),;
-
-// autogenerated using string template disenumpart25.txt
+    VERY_LARGE_MOTORBOAT_GREATER_THAN_65FT_198M (4, "Very Large Motorboat (greater than 65ft/19.8m)");
 
     private int value;
     private final String description;
@@ -93,8 +73,6 @@ public enum PlatformSurfacePrivateMotorboatSubcategories implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateSailboatSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateSailboatSubcategories.java
index 7da1a469ee7560776b81c087736afeb918cfe787..e97e9225db96d998b2985fdfa6af5bd92f219b7a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateSailboatSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateSailboatSubcategories.java
@@ -7,43 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 446, marshal size 8,
- * PlatformSurfacePrivateSailboatSubcategories
+ * Generated from XML, <br>
+ * UID 446 marshal size 8<br>
+ * PlatformSurfacePrivateSailboatSubcategories<br>
  * Subcategories for Surface Platform Category 85.
  */
 public enum PlatformSurfacePrivateSailboatSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Small Sailboat (up to 26ft/7.9m) */
-// autogenerated using string template disenumpart2.txt
-
     SMALL_SAILBOAT_UP_TO_26FT_79M (1, "Small Sailboat (up to 26ft/7.9m)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium Sailboat (up to 39ft/11.9m) */
-// autogenerated using string template disenumpart2.txt
-
     MEDIUM_SAILBOAT_UP_TO_39FT_119M (2, "Medium Sailboat (up to 39ft/11.9m)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Large Sailboat (up to 65ft/19.8m) */
-// autogenerated using string template disenumpart2.txt
-
     LARGE_SAILBOAT_UP_TO_65FT_198M (3, "Large Sailboat (up to 65ft/19.8m)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Very Large Sailboat (greater than 65ft/19.8m) */
-// autogenerated using string template disenumpart2.txt
-
-    VERY_LARGE_SAILBOAT_GREATER_THAN_65FT_198M (4, "Very Large Sailboat (greater than 65ft/19.8m)"),;
-
-// autogenerated using string template disenumpart25.txt
+    VERY_LARGE_SAILBOAT_GREATER_THAN_65FT_198M (4, "Very Large Sailboat (greater than 65ft/19.8m)");
 
     private int value;
     private final String description;
@@ -93,8 +73,6 @@ public enum PlatformSurfacePrivateSailboatSubcategories implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceSupportVesselSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceSupportVesselSubcategories.java
index 54bc3e84f8ea96f6a27153ecb1cbefd9f4024a2c..7544354653d88100b4bd0137e49c58e079b7de27 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceSupportVesselSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceSupportVesselSubcategories.java
@@ -7,73 +7,33 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 444, marshal size 8,
- * PlatformSurfaceSupportVesselSubcategories
+ * Generated from XML, <br>
+ * UID 444 marshal size 8<br>
+ * PlatformSurfaceSupportVesselSubcategories<br>
  * Subcategories for Surface Platform Category 83
  */
 public enum PlatformSurfaceSupportVesselSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Platform Supply Vessel */
-// autogenerated using string template disenumpart2.txt
-
     PLATFORM_SUPPLY_VESSEL (1, "Platform Supply Vessel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tender Vessel */
-// autogenerated using string template disenumpart2.txt
-
     TENDER_VESSEL (2, "Tender Vessel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tugboat */
-// autogenerated using string template disenumpart2.txt
-
     TUGBOAT (3, "Tugboat"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dive Support Vessel */
-// autogenerated using string template disenumpart2.txt
-
     DIVE_SUPPORT_VESSEL (4, "Dive Support Vessel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fireboat */
-// autogenerated using string template disenumpart2.txt
-
     FIREBOAT (5, "Fireboat"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Well Stimulation Vessel (WSV) */
-// autogenerated using string template disenumpart2.txt
-
     WELL_STIMULATION_VESSEL_WSV (6, "Well Stimulation Vessel (WSV)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Anchor Handling Tug Supply Vessel (AHTS) */
-// autogenerated using string template disenumpart2.txt
-
     ANCHOR_HANDLING_TUG_SUPPLY_VESSEL_AHTS (7, "Anchor Handling Tug Supply Vessel (AHTS)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Offshore Construction Vessel (OCV) */
-// autogenerated using string template disenumpart2.txt
-
     OFFSHORE_CONSTRUCTION_VESSEL_OCV (8, "Offshore Construction Vessel (OCV)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Emergency Response and Rescue Vessel (ERRV) */
-// autogenerated using string template disenumpart2.txt
-
-    EMERGENCY_RESPONSE_AND_RESCUE_VESSEL_ERRV (9, "Emergency Response and Rescue Vessel (ERRV)"),;
-
-// autogenerated using string template disenumpart25.txt
+    EMERGENCY_RESPONSE_AND_RESCUE_VESSEL_ERRV (9, "Emergency Response and Rescue Vessel (ERRV)");
 
     private int value;
     private final String description;
@@ -123,8 +83,6 @@ public enum PlatformSurfaceSupportVesselSubcategories implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceTankerSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceTankerSubcategories.java
index 02d9425407ba0787bbfd46f103ca7af1f9a733d7..1e5235dc1970ff0bd09c58d7e3249189b462a006 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceTankerSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceTankerSubcategories.java
@@ -7,73 +7,33 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 443, marshal size 8,
- * PlatformSurfaceTankerSubcategories
+ * Generated from XML, <br>
+ * UID 443 marshal size 8<br>
+ * PlatformSurfaceTankerSubcategories<br>
  * Subcategories for Surface Platform Category 82.
  */
 public enum PlatformSurfaceTankerSubcategories implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Liquid Petroleum Gas (LPG)Tanker */
-// autogenerated using string template disenumpart2.txt
-
     LIQUID_PETROLEUM_GAS_LPGTANKER (1, "Liquid Petroleum Gas (LPG)Tanker"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Chemical Tanker */
-// autogenerated using string template disenumpart2.txt
-
     CHEMICAL_TANKER (2, "Chemical Tanker"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Liquid Natural Gas (LNG) Tanker */
-// autogenerated using string template disenumpart2.txt
-
     LIQUID_NATURAL_GAS_LNG_TANKER (3, "Liquid Natural Gas (LNG) Tanker"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Coastal Trading Vessel (Coaster) */
-// autogenerated using string template disenumpart2.txt
-
     COASTAL_TRADING_VESSEL_COASTER (4, "Coastal Trading Vessel (Coaster)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Crude Oil Tanker (up to 159,999 DWT) */
-// autogenerated using string template disenumpart2.txt
-
     CRUDE_OIL_TANKER_UP_TO_159_999_DWT (5, "Crude Oil Tanker (up to 159,999 DWT)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Liquid Bulk Tanker */
-// autogenerated using string template disenumpart2.txt
-
     LIQUID_BULK_TANKER (6, "Liquid Bulk Tanker"),
-// autogenerated using string template disenumfootnotecomment.txt
-
-    /** Very Large Crude Carrier (160,000–319,999 DWT) */
-// autogenerated using string template disenumpart2.txt
-
-    VERY_LARGE_CRUDE_CARRIER_160_000_319_999_DWT (7, "Very Large Crude Carrier (160,000–319,999 DWT)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
-    /** Ultra Large Crude Carrier (320,000–549,999 DWT) */
-// autogenerated using string template disenumpart2.txt
-
-    ULTRA_LARGE_CRUDE_CARRIER_320_000_549_999_DWT (8, "Ultra Large Crude Carrier (320,000–549,999 DWT)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
+    /** Very Large Crude Carrier (160,000-319,999 DWT) */
+    VERY_LARGE_CRUDE_CARRIER_160_000_319_999_DWT (7, "Very Large Crude Carrier (160,000-319,999 DWT)"),
+    /** Ultra Large Crude Carrier (320,000-549,999 DWT) */
+    ULTRA_LARGE_CRUDE_CARRIER_320_000_549_999_DWT (8, "Ultra Large Crude Carrier (320,000-549,999 DWT)"),
     /** Condensate Storage Tanker */
-// autogenerated using string template disenumpart2.txt
-
-    CONDENSATE_STORAGE_TANKER (9, "Condensate Storage Tanker"),;
-
-// autogenerated using string template disenumpart25.txt
+    CONDENSATE_STORAGE_TANKER (9, "Condensate Storage Tanker");
 
     private int value;
     private final String description;
@@ -123,8 +83,6 @@ public enum PlatformSurfaceTankerSubcategories implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RadioCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/RadioCategory.java
index 0a750915eea00f22110a4f51f10a69ba7d475137..6a91c4b4488ae356e5c9a36e3decd6a06bf72bbe 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RadioCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RadioCategory.java
@@ -7,282 +7,101 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 22,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 22 marshal size 8<br>
  * RadioCategory
  */
 public enum RadioCategory implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Voice Transmission/Reception */
-// autogenerated using string template disenumpart2.txt
-
     VOICE_TRANSMISSION_RECEPTION (1, "Voice Transmission/Reception"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Data Link Transmission/Reception */
-// autogenerated using string template disenumpart2.txt
-
     DATA_LINK_TRANSMISSION_RECEPTION (2, "Data Link Transmission/Reception"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Voice and Data Link Transmission/Reception */
-// autogenerated using string template disenumpart2.txt
-
     VOICE_AND_DATA_LINK_TRANSMISSION_RECEPTION (3, "Voice and Data Link Transmission/Reception"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Instrumented Landing System (ILS) Glideslope Transmitter */
-// autogenerated using string template disenumpart2.txt
-
     INSTRUMENTED_LANDING_SYSTEM_ILS_GLIDESLOPE_TRANSMITTER (4, "Instrumented Landing System (ILS) Glideslope Transmitter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Instrumented Landing System (ILS) Localizer Transmitter */
-// autogenerated using string template disenumpart2.txt
-
     INSTRUMENTED_LANDING_SYSTEM_ILS_LOCALIZER_TRANSMITTER (5, "Instrumented Landing System (ILS) Localizer Transmitter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Instrumented Landing System (ILS) Outer Marker Beacon */
-// autogenerated using string template disenumpart2.txt
-
     INSTRUMENTED_LANDING_SYSTEM_ILS_OUTER_MARKER_BEACON (6, "Instrumented Landing System (ILS) Outer Marker Beacon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Instrumented Landing System (ILS) Middle Marker Beacon */
-// autogenerated using string template disenumpart2.txt
-
     INSTRUMENTED_LANDING_SYSTEM_ILS_MIDDLE_MARKER_BEACON (7, "Instrumented Landing System (ILS) Middle Marker Beacon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Instrumented Landing System (ILS) Inner Marker Beacon */
-// autogenerated using string template disenumpart2.txt
-
     INSTRUMENTED_LANDING_SYSTEM_ILS_INNER_MARKER_BEACON (8, "Instrumented Landing System (ILS) Inner Marker Beacon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Instrumented Landing System (ILS) Receiver (Platform Radio) */
-// autogenerated using string template disenumpart2.txt
-
     INSTRUMENTED_LANDING_SYSTEM_ILS_RECEIVER_PLATFORM_RADIO (9, "Instrumented Landing System (ILS) Receiver (Platform Radio)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tactical Air Navigation (TACAN) Transmitter (Ground Fixed Equipment) */
-// autogenerated using string template disenumpart2.txt
-
     TACTICAL_AIR_NAVIGATION_TACAN_TRANSMITTER_GROUND_FIXED_EQUIPMENT (10, "Tactical Air Navigation (TACAN) Transmitter (Ground Fixed Equipment)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tactical Air Navigation (TACAN) Receiver (Moving Platform Equipment) */
-// autogenerated using string template disenumpart2.txt
-
     TACTICAL_AIR_NAVIGATION_TACAN_RECEIVER_MOVING_PLATFORM_EQUIPMENT (11, "Tactical Air Navigation (TACAN) Receiver (Moving Platform Equipment)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tactical Air Navigation (TACAN) Transmitter/Receiver (Moving Platform Equipment) */
-// autogenerated using string template disenumpart2.txt
-
     TACTICAL_AIR_NAVIGATION_TACAN_TRANSMITTER_RECEIVER_MOVING_PLATFORM_EQUIPMENT (12, "Tactical Air Navigation (TACAN) Transmitter/Receiver (Moving Platform Equipment)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Variable Omni-Ranging (VOR) Transmitter (Ground Fixed Equipment) */
-// autogenerated using string template disenumpart2.txt
-
     VARIABLE_OMNI_RANGING_VOR_TRANSMITTER_GROUND_FIXED_EQUIPMENT (13, "Variable Omni-Ranging (VOR) Transmitter (Ground Fixed Equipment)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Variable Omni-Ranging (VOR) with Distance Measuring Equipment (DME) Transmitter (Ground Fixed Equipment) */
-// autogenerated using string template disenumpart2.txt
-
     VARIABLE_OMNI_RANGING_VOR_WITH_DISTANCE_MEASURING_EQUIPMENT_DME_TRANSMITTER_GROUND_FIXED_EQUIPMENT (14, "Variable Omni-Ranging (VOR) with Distance Measuring Equipment (DME) Transmitter (Ground Fixed Equipment)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Combined VOR/ILS Receiver (Moving Platform Equipment) */
-// autogenerated using string template disenumpart2.txt
-
     COMBINED_VOR_ILS_RECEIVER_MOVING_PLATFORM_EQUIPMENT (15, "Combined VOR/ILS Receiver (Moving Platform Equipment)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Combined VOR and TACAN (VORTAC) Transmitter */
-// autogenerated using string template disenumpart2.txt
-
     COMBINED_VOR_TACAN_VORTAC_TRANSMITTER (16, "Combined VOR & TACAN (VORTAC) Transmitter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Non-Directional Beacon (NDB) Transmitter */
-// autogenerated using string template disenumpart2.txt
-
     NON_DIRECTIONAL_BEACON_NDB_TRANSMITTER (17, "Non-Directional Beacon (NDB) Transmitter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Non-Directional Beacon (NDB) Receiver */
-// autogenerated using string template disenumpart2.txt
-
     NON_DIRECTIONAL_BEACON_NDB_RECEIVER (18, "Non-Directional Beacon (NDB) Receiver"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Non-Directional Beacon (NDB) with Distance Measuring Equipment (DME) Transmitter */
-// autogenerated using string template disenumpart2.txt
-
     NON_DIRECTIONAL_BEACON_NDB_WITH_DISTANCE_MEASURING_EQUIPMENT_DME_TRANSMITTER (19, "Non-Directional Beacon (NDB) with Distance Measuring Equipment (DME) Transmitter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Distance Measuring Equipment (DME) */
-// autogenerated using string template disenumpart2.txt
-
     DISTANCE_MEASURING_EQUIPMENT_DME (20, "Distance Measuring Equipment (DME)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Link 16 Terminal */
-// autogenerated using string template disenumpart2.txt
-
     LINK_16_TERMINAL (21, "Link 16 Terminal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Link 11 Terminal */
-// autogenerated using string template disenumpart2.txt
-
     LINK_11_TERMINAL (22, "Link 11 Terminal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Link 11B Terminal */
-// autogenerated using string template disenumpart2.txt
-
     LINK_11B_TERMINAL (23, "Link 11B Terminal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** EPLRS/SADL Terminal */
-// autogenerated using string template disenumpart2.txt
-
     EPLRS_SADL_TERMINAL (24, "EPLRS/SADL Terminal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** F-22 Intra-Flight Data Link (IFDL) */
-// autogenerated using string template disenumpart2.txt
-
     F_22_INTRA_FLIGHT_DATA_LINK_IFDL (25, "F-22 Intra-Flight Data Link (IFDL)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** F-35 Multifunction Advanced Data Link (MADL) */
-// autogenerated using string template disenumpart2.txt
-
     F_35_MULTIFUNCTION_ADVANCED_DATA_LINK_MADL (26, "F-35 Multifunction Advanced Data Link (MADL)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SINCGARS Terminal */
-// autogenerated using string template disenumpart2.txt
-
     SINCGARS_TERMINAL (27, "SINCGARS Terminal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** L-Band SATCOM Terminal */
-// autogenerated using string template disenumpart2.txt
-
     IDENTIFICATION_FRIEND_OR_FOE (28, "L-Band SATCOM Terminal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** IBS Terminal */
-// autogenerated using string template disenumpart2.txt
-
     IBS_TERMINAL (29, "IBS Terminal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** GPS */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "GPS"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tactical Video */
-// autogenerated using string template disenumpart2.txt
-
     TACTICAL_VIDEO (31, "Tactical Video"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Air-to-Air Missile Datalink */
-// autogenerated using string template disenumpart2.txt
-
     AIR_TO_AIR_MISSILE_DATALINK (32, "Air-to-Air Missile Datalink"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Link 16 Surrogate for Non-NATO TDL Terminal, Using Link 16 and SISO-STD-002 to simulate a non-NATO TDL system */
-// autogenerated using string template disenumpart2.txt
-
     LINK_16_SURROGATE_FOR_NON_NATO_TDL_TERMINAL (33, "Link 16 Surrogate for Non-NATO TDL Terminal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** MQ-1/9 C-Band LOS Datalink */
-// autogenerated using string template disenumpart2.txt
-
     MQ_1_9_C_BAND_LOS_DATALINK (34, "MQ-1/9 C-Band LOS Datalink"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** MQ-1/9 Ku-Band SATCOM Datalink */
-// autogenerated using string template disenumpart2.txt
-
     MQ_1_9_KU_BAND_SATCOM_DATALINK (35, "MQ-1/9 Ku-Band SATCOM Datalink"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Air-to-Ground Weapon Datalink */
-// autogenerated using string template disenumpart2.txt
-
     AIR_TO_GROUND_WEAPON_DATALINK (36, "Air-to-Ground Weapon Datalink"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Automatic Identification System (AIS) */
-// autogenerated using string template disenumpart2.txt
-
     AUTOMATIC_IDENTIFICATION_SYSTEM_AIS (37, "Automatic Identification System (AIS)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** JPALS Data Link */
-// autogenerated using string template disenumpart2.txt
-
     JPALS_DATA_LINK (38, "JPALS Data Link"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Combat Search and Rescue (CSAR) Radio */
-// autogenerated using string template disenumpart2.txt
-
     COMBAT_SEARCH_AND_RESCUE_CSAR_RADIO (40, "Combat Search and Rescue (CSAR) Radio"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Counter Unmanned Aircraft System (C-UAS) Radio */
-// autogenerated using string template disenumpart2.txt
-
     COUNTER_UNMANNED_AIRCRAFT_SYSTEM_C_UAS_RADIO (41, "Counter Unmanned Aircraft System (C-UAS) Radio"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Emergency Position-Indicating Radio Beacons (EPIRB) */
-// autogenerated using string template disenumpart2.txt
-
     EMERGENCY_POSITION_INDICATING_RADIO_BEACONS_EPIRB (42, "Emergency Position-Indicating Radio Beacons (EPIRB)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Electronic Attack Systems */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "Electronic Attack Systems"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tactical Targeting Network Technology (TTNT) */
-// autogenerated using string template disenumpart2.txt
-
-    CREATE_ENTITY_RELIABLE (51, "Tactical Targeting Network Technology (TTNT)"),;
-
-// autogenerated using string template disenumpart25.txt
+    CREATE_ENTITY_RELIABLE (51, "Tactical Targeting Network Technology (TTNT)");
 
     private int value;
     private final String description;
@@ -332,8 +151,6 @@ public enum RadioCategory implements Category
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RepairGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/RepairGroups.java
index 92af296d8d17a30c089fa7faf69580cfab1c28b2..6e8118f95c691d14344a2ea8e928f8fdaa2584bf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RepairGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RepairGroups.java
@@ -7,78 +7,33 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 272,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 272 marshal size 8<br>
  * RepairGroups
  */
 public enum RepairGroups 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** General Repair Codes */
-// autogenerated using string template disenumpart2.txt
-
     GENERAL_REPAIR_CODES (0, "General Repair Codes"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Drive Train */
-// autogenerated using string template disenumpart2.txt
-
     DRIVE_TRAIN (1, "Drive Train"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hull/Airframe/Body */
-// autogenerated using string template disenumpart2.txt
-
     HULL_AIRFRAME_BODY (2, "Hull/Airframe/Body"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Interfaces with Environment */
-// autogenerated using string template disenumpart2.txt
-
     INTERFACES_WITH_ENVIRONMENT (3, "Interfaces with Environment"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Weapons */
-// autogenerated using string template disenumpart2.txt
-
     WEAPONS (4, "Weapons"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fuel Systems */
-// autogenerated using string template disenumpart2.txt
-
     FUEL_SYSTEMS (5, "Fuel Systems"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Electronics */
-// autogenerated using string template disenumpart2.txt
-
     ELECTRONICS (6, "Electronics"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Life Support Systems */
-// autogenerated using string template disenumpart2.txt
-
     LIFE_SUPPORT_SYSTEMS (7, "Life Support Systems"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hydraulic Systems and Actuators */
-// autogenerated using string template disenumpart2.txt
-
     HYDRAULIC_SYSTEMS_AND_ACTUATORS (8, "Hydraulic Systems and Actuators"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Auxiliary Craft */
-// autogenerated using string template disenumpart2.txt
-
-    AUXILIARY_CRAFT (9, "Auxiliary Craft"),;
-
-// autogenerated using string template disenumpart25.txt
+    AUXILIARY_CRAFT (9, "Auxiliary Craft");
 
     private int value;
     private final String description;
@@ -128,8 +83,6 @@ public enum RepairGroups
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RepairResponseRepairResult.java b/src-generated/edu/nps/moves/dis7/enumerations/RepairResponseRepairResult.java
index 2f1571c25117b121d4972ae824e07690158cf7b8..51e427e85fdc58cedbd7b64325b9d3c8beef2a58 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RepairResponseRepairResult.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RepairResponseRepairResult.java
@@ -7,48 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 65,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 65 marshal size 8<br>
  * RepairResponseRepairResult
  */
 public enum RepairResponseRepairResult 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** repair ended */
-// autogenerated using string template disenumpart2.txt
-
     REPAIR_ENDED (1, "repair ended"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** invalid repair */
-// autogenerated using string template disenumpart2.txt
-
     INVALID_REPAIR (2, "invalid repair"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** repair interrupted */
-// autogenerated using string template disenumpart2.txt
-
     REPAIR_INTERRUPTED (3, "repair interrupted"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** service canceled by the supplier */
-// autogenerated using string template disenumpart2.txt
-
-    SERVICE_CANCELED_BY_THE_SUPPLIER (4, "service canceled by the supplier"),;
-
-// autogenerated using string template disenumpart25.txt
+    SERVICE_CANCELED_BY_THE_SUPPLIER (4, "service canceled by the supplier");
 
     private int value;
     private final String description;
@@ -98,8 +73,6 @@ public enum RepairResponseRepairResult
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ReplyAmplification.java b/src-generated/edu/nps/moves/dis7/enumerations/ReplyAmplification.java
index 8838685ed9f26ccf348712ec5e1144f4947e933d..1059915d92a43376191ca41a6f505b6888f89e15 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ReplyAmplification.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ReplyAmplification.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 373,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 373 marshal size 8<br>
  * ReplyAmplification
  */
 public enum ReplyAmplification 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Complete */
-// autogenerated using string template disenumpart2.txt
-
     COMPLETE (1, "Complete"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Limted */
-// autogenerated using string template disenumpart2.txt
-
     LIMTED (2, "Limted"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Unable to Respond */
-// autogenerated using string template disenumpart2.txt
-
-    UNABLE_TO_RESPOND (3, "Unable to Respond"),;
-
-// autogenerated using string template disenumpart25.txt
+    UNABLE_TO_RESPOND (3, "Unable to Respond");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum ReplyAmplification
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RequiredReliabilityService.java b/src-generated/edu/nps/moves/dis7/enumerations/RequiredReliabilityService.java
index b3900b9099adb8db486fa02dbb05dd1e395372db..33138e66504ae416f682c35dc50d0ff9f188db2d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RequiredReliabilityService.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RequiredReliabilityService.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 74,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 74 marshal size 8<br>
  * RequiredReliabilityService
  */
 public enum RequiredReliabilityService 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Acknowledged */
-// autogenerated using string template disenumpart2.txt
-
     ACKNOWLEDGED (0, "Acknowledged"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Unacknowledged */
-// autogenerated using string template disenumpart2.txt
-
-    UNACKNOWLEDGED (1, "Unacknowledged"),;
-
-// autogenerated using string template disenumpart25.txt
+    UNACKNOWLEDGED (1, "Unacknowledged");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum RequiredReliabilityService
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SISOSTD002Version.java b/src-generated/edu/nps/moves/dis7/enumerations/SISOSTD002Version.java
index 7f9fdfc1a5cd0301468c0060fa383ddf82f44116..6453f0fb5ea492eef1d785e9550f8b58e567ebd9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SISOSTD002Version.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SISOSTD002Version.java
@@ -7,24 +7,15 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 736,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 736 marshal size 8<br>
  * SISOSTD002Version
  */
 public enum SISOSTD002Version 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SISO-STD-002-2006 */
-// autogenerated using string template disenumpart2.txt
-
-    SISO_STD_002_2006 (0, "SISO-STD-002-2006"),;
-
-// autogenerated using string template disenumpart25.txt
+    SISO_STD_002_2006 (0, "SISO-STD-002-2006");
 
     private int value;
     private final String description;
@@ -74,8 +65,6 @@ public enum SISOSTD002Version
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Season.java b/src-generated/edu/nps/moves/dis7/enumerations/Season.java
index 40dec659aa087e0440e08c27f1c4c9549566a537..bf3c6407f1652225b4e1bccd91270fcf87487260 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Season.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Season.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 465,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 465 marshal size 2<br>
  * Season
  */
 public enum Season 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Summer */
-// autogenerated using string template disenumpart2.txt
-
     SUMMER (0, "Summer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Winter */
-// autogenerated using string template disenumpart2.txt
-
     WINTER (1, "Winter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Spring */
-// autogenerated using string template disenumpart2.txt
-
     SPRING (2, "Spring"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Autumn */
-// autogenerated using string template disenumpart2.txt
-
-    AUTUMN (3, "Autumn"),;
-
-// autogenerated using string template disenumpart25.txt
+    AUTUMN (3, "Autumn");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum Season
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCategory.java
index b382eb7da1a181c8a12a7931a1302bae962b6314..dec0a0a3fe952d04d374b5261fd888f827aab009 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCategory.java
@@ -7,120 +7,47 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 28,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 28 marshal size 8<br>
  * SensorEmitterCategory
  */
 public enum SensorEmitterCategory implements Category
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Multi-spectral */
-// autogenerated using string template disenumpart2.txt
-
     MULTI_SPECTRAL (1, "Multi-spectral"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** RF Active */
-// autogenerated using string template disenumpart2.txt
-
     RF_ACTIVE (2, "RF Active"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** RF Passive (intercept and DF) */
-// autogenerated using string template disenumpart2.txt
-
     RF_PASSIVE_INTERCEPT_AND_DF (3, "RF Passive (intercept and DF)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Optical (direct viewing with or without optics) */
-// autogenerated using string template disenumpart2.txt
-
     OPTICAL_DIRECT_VIEWING_WITH_OR_WITHOUT_OPTICS (4, "Optical (direct viewing with or without optics)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Electro-Optical */
-// autogenerated using string template disenumpart2.txt
-
     ELECTRO_OPTICAL (5, "Electro-Optical"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Seismic */
-// autogenerated using string template disenumpart2.txt
-
     SEISMIC (6, "Seismic"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Chemical, point detector */
-// autogenerated using string template disenumpart2.txt
-
     CHEMICAL_POINT_DETECTOR (7, "Chemical, point detector"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Chemical, standoff */
-// autogenerated using string template disenumpart2.txt
-
     CHEMICAL_STANDOFF (8, "Chemical, standoff"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Thermal (temperature sensing) */
-// autogenerated using string template disenumpart2.txt
-
     THERMAL_TEMPERATURE_SENSING (9, "Thermal (temperature sensing)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Acoustic, Active */
-// autogenerated using string template disenumpart2.txt
-
     ACOUSTIC_ACTIVE (10, "Acoustic, Active"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Acoustic, Passive */
-// autogenerated using string template disenumpart2.txt
-
     ACOUSTIC_PASSIVE (11, "Acoustic, Passive"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Contact/Pressure (physical, hydrostatic, barometric) */
-// autogenerated using string template disenumpart2.txt
-
     CONTACT_PRESSURE_PHYSICAL_HYDROSTATIC_BAROMETRIC (12, "Contact/Pressure (physical, hydrostatic, barometric)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Electro-Magnetic Radiation (gamma radiation) */
-// autogenerated using string template disenumpart2.txt
-
     ELECTRO_MAGNETIC_RADIATION_GAMMA_RADIATION (13, "Electro-Magnetic Radiation (gamma radiation)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Particle Radiation (Neutrons, alpha, beta particles) */
-// autogenerated using string template disenumpart2.txt
-
     PARTICLE_RADIATION_NEUTRONS_ALPHA_BETA_PARTICLES (14, "Particle Radiation (Neutrons, alpha, beta particles)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Magnetic */
-// autogenerated using string template disenumpart2.txt
-
     MAGNETIC (15, "Magnetic"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Gravitational */
-// autogenerated using string template disenumpart2.txt
-
-    GRAVITATIONAL (16, "Gravitational"),;
-
-// autogenerated using string template disenumpart25.txt
+    GRAVITATIONAL (16, "Gravitational");
 
     private int value;
     private final String description;
@@ -170,8 +97,6 @@ public enum SensorEmitterCategory implements Category
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorOnOffStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorOnOffStatus.java
index 51bd24c445725ef7e64e9015d42a047cc9dae07c..5a00f1514040fd1c3be6db57f2b68ae4236c6443 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorOnOffStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorOnOffStatus.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 331,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 331 marshal size 8<br>
  * SensorOnOffStatus
  */
 public enum SensorOnOffStatus 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Off */
-// autogenerated using string template disenumpart2.txt
-
     OFF (0, "Off"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** On */
-// autogenerated using string template disenumpart2.txt
-
-    ON (1, "On"),;
-
-// autogenerated using string template disenumpart25.txt
+    ON (1, "On");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum SensorOnOffStatus
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorTypeSource.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorTypeSource.java
index 891a7897b45eac2755dcba43dbd85b74222ffd56..1b2983dd00f199fd10e03c827df7929f0c0fa88f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorTypeSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorTypeSource.java
@@ -7,54 +7,25 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 414,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 414 marshal size 8<br>
  * SensorTypeSource
  */
 public enum SensorTypeSource 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other Active Sensors */
-// autogenerated using string template disenumpart2.txt
-
     OTHER_ACTIVE_SENSORS (0, "Other Active Sensors"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Electromagnetic */
-// autogenerated using string template disenumpart2.txt
-
     ELECTROMAGNETIC (1, "Electromagnetic"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Passive Sensors */
-// autogenerated using string template disenumpart2.txt
-
     PASSIVE_SENSORS (2, "Passive Sensors"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Minefield Sensors */
-// autogenerated using string template disenumpart2.txt
-
     MINEFIELD_SENSORS (3, "Minefield Sensors"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Underwater Acoustics */
-// autogenerated using string template disenumpart2.txt
-
     UNDERWATER_ACOUSTICS (4, "Underwater Acoustics"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Lasers */
-// autogenerated using string template disenumpart2.txt
-
-    LASERS (5, "Lasers"),;
-
-// autogenerated using string template disenumpart25.txt
+    LASERS (5, "Lasers");
 
     private int value;
     private final String description;
@@ -104,8 +75,6 @@ public enum SensorTypeSource
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPPreEntityIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPPreEntityIndicator.java
index ac6cb9b993137ca52e3d055109d46c1bdbe7d619..8c41b8f12498dc1a8e0891e5656b3318e88e77ee 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPPreEntityIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPPreEntityIndicator.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 283,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 283 marshal size 8<br>
  * SeparationVPPreEntityIndicator
  */
 public enum SeparationVPPreEntityIndicator 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Entity ID Existed Prior to Separation without Entity State PDU */
-// autogenerated using string template disenumpart2.txt
-
     ENTITY_ID_EXISTED_PRIOR_TO_SEPARATION_WITHOUT_ENTITY_STATE_PDU (1, "Entity ID Existed Prior to Separation without Entity State PDU"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Entity ID Existed Prior to Separation with Entity State PDU Issued */
-// autogenerated using string template disenumpart2.txt
-
     ENTITY_ID_EXISTED_PRIOR_TO_SEPARATION_WITH_ENTITY_STATE_PDU_ISSUED (2, "Entity ID Existed Prior to Separation with Entity State PDU Issued"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Entity Initially Created at Separation Event */
-// autogenerated using string template disenumpart2.txt
-
-    ENTITY_INITIALLY_CREATED_AT_SEPARATION_EVENT (3, "Entity Initially Created at Separation Event"),;
-
-// autogenerated using string template disenumpart25.txt
+    ENTITY_INITIALLY_CREATED_AT_SEPARATION_EVENT (3, "Entity Initially Created at Separation Event");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum SeparationVPPreEntityIndicator
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPReasonforSeparation.java b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPReasonforSeparation.java
index 516040da8a669e606a41b3abe38672755539d662..8dbc1a070e3d4145eac8a602f33789d32b3e21da 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPReasonforSeparation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPReasonforSeparation.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 282,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 282 marshal size 8<br>
  * SeparationVPReasonforSeparation
  */
 public enum SeparationVPReasonforSeparation 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Attached Part Separation */
-// autogenerated using string template disenumpart2.txt
-
     ATTACHED_PART_SEPARATION (1, "Attached Part Separation"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Submunition Separation */
-// autogenerated using string template disenumpart2.txt
-
-    SUBMUNITION_SEPARATION (2, "Submunition Separation"),;
-
-// autogenerated using string template disenumpart25.txt
+    SUBMUNITION_SEPARATION (2, "Submunition Separation");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum SeparationVPReasonforSeparation
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ServiceRequestServiceTypeRequested.java b/src-generated/edu/nps/moves/dis7/enumerations/ServiceRequestServiceTypeRequested.java
index c353aad1f2c9428066a27d7c9c48bacf1602a930..60175dcb3f8650304d4efca88c07e3f7de84d3bd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ServiceRequestServiceTypeRequested.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ServiceRequestServiceTypeRequested.java
@@ -7,48 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 63,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 63 marshal size 8<br>
  * ServiceRequestServiceTypeRequested
  */
 public enum ServiceRequestServiceTypeRequested 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Resupply */
-// autogenerated using string template disenumpart2.txt
-
     RESUPPLY (1, "Resupply"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Repair */
-// autogenerated using string template disenumpart2.txt
-
     REPAIR (2, "Repair"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Aerial Refueling High Fidelity */
-// autogenerated using string template disenumpart2.txt
-
     AERIAL_REFUELING_HIGH_FIDELITY (3, "Aerial Refueling High Fidelity"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Aerial Refueling Low Fidelity */
-// autogenerated using string template disenumpart2.txt
-
-    AERIAL_REFUELING_LOW_FIDELITY (4, "Aerial Refueling Low Fidelity"),;
-
-// autogenerated using string template disenumpart25.txt
+    AERIAL_REFUELING_LOW_FIDELITY (4, "Aerial Refueling Low Fidelity");
 
     private int value;
     private final String description;
@@ -98,8 +73,6 @@ public enum ServiceRequestServiceTypeRequested
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingClass.java b/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingClass.java
index c91e7006e48d1ea5c6adc3ac74f1089508ca298e..f57ceccc1b89c52afed3255a9a587699dbcbfc86 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingClass.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 270,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 270 marshal size 2<br>
  * SignalEncodingClass
  */
 public enum SignalEncodingClass 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Encoded audio */
-// autogenerated using string template disenumpart2.txt
-
     ENCODED_AUDIO (0, "Encoded audio"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Raw Binary Data */
-// autogenerated using string template disenumpart2.txt
-
     RAW_BINARY_DATA (1, "Raw Binary Data"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Application-Specific Data */
-// autogenerated using string template disenumpart2.txt
-
     APPLICATION_SPECIFIC_DATA (2, "Application-Specific Data"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Database index */
-// autogenerated using string template disenumpart2.txt
-
-    DATABASE_INDEX (3, "Database index"),;
-
-// autogenerated using string template disenumpart25.txt
+    DATABASE_INDEX (3, "Database index");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum SignalEncodingClass
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java
index 046271f85db549e351b47d9ad21073deda5e5517..e0bc7ee170a207cc03e3efe5e1e221a51223bac4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java
@@ -7,55 +7,27 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 132, marshal size 8,
- * SpecificDimensionEnumerationsforAirAreaSize
+ * Generated from XML, <br>
+ * UID 132 marshal size 8<br>
+ * SpecificDimensionEnumerationsforAirAreaSize<br>
  * The gaps in enumeration values are intentional and are reserved for future additions.
  */
 public enum SpecificDimensionEnumerationsforAirAreaSize 
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Small Flock/Swarm (.5km long x 5m wide - 1km x 5m) */
-// autogenerated using string template disenumpart2.txt
-
     SMALL_FLOCK_SWARM_5KM_LONG_X_5M_WIDE_1KM_X_5M (222, "Small Flock/Swarm (.5km long x 5m wide - 1km x 5m)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Small Flock/Swarm, Dense (.5km long x 5m wide - 1km x 5m) */
-// autogenerated using string template disenumpart2.txt
-
     SMALL_FLOCK_SWARM_DENSE_5KM_LONG_X_5M_WIDE_1KM_X_5M (223, "Small Flock/Swarm, Dense (.5km long x 5m wide - 1km x 5m)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium Flock/Swarm (1km long x 10m wide - 2km x 10m) */
-// autogenerated using string template disenumpart2.txt
-
     MEDIUM_FLOCK_SWARM_1KM_LONG_X_10M_WIDE_2KM_X_10M (224, "Medium Flock/Swarm (1km long x 10m wide - 2km x 10m)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium Flock/Swarm, Dense (1km long x 10m wide - 2km x 10m) */
-// autogenerated using string template disenumpart2.txt
-
     MEDIUM_FLOCK_SWARM_DENSE_1KM_LONG_X_10M_WIDE_2KM_X_10M (225, "Medium Flock/Swarm, Dense (1km long x 10m wide - 2km x 10m)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Large Flock/Swarm (10km long x 100m wide - 20km x 100m) */
-// autogenerated using string template disenumpart2.txt
-
     LARGE_FLOCK_SWARM_10KM_LONG_X_100M_WIDE_20KM_X_100M (226, "Large Flock/Swarm (10km long x 100m wide - 20km x 100m)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Large Flock/Swarm, Dense (10km long x 100m wide - 20km x 100m) */
-// autogenerated using string template disenumpart2.txt
-
-    LARGE_FLOCK_SWARM_DENSE_10KM_LONG_X_100M_WIDE_20KM_X_100M (227, "Large Flock/Swarm, Dense (10km long x 100m wide - 20km x 100m)"),;
-
-// autogenerated using string template disenumpart25.txt
+    LARGE_FLOCK_SWARM_DENSE_10KM_LONG_X_100M_WIDE_20KM_X_100M (227, "Large Flock/Swarm, Dense (10km long x 100m wide - 20km x 100m)");
 
     private int value;
     private final String description;
@@ -105,8 +77,6 @@ public enum SpecificDimensionEnumerationsforAirAreaSize
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java
index cd3682d9eed42c8835cb428ff5ebc15993289fc7..c3911c93756e91970f3f8311d7b3ae2bbbdde533 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java
@@ -7,55 +7,27 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 131, marshal size 8,
- * SpecificDimensionEnumerationsforLandAreaSize
+ * Generated from XML, <br>
+ * UID 131 marshal size 8<br>
+ * SpecificDimensionEnumerationsforLandAreaSize<br>
  * The gaps in enumeration values are intentional and are reserved for future additions.
  */
 public enum SpecificDimensionEnumerationsforLandAreaSize 
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Small Area (2,000m2 - 4,000m2 / .5 to 1 sq. acre ) */
-// autogenerated using string template disenumpart2.txt
-
     SMALL_AREA_2_000M2_4_000M2_5_TO_1_SQ_ACRE_ (222, "Small Area (2,000m2 - 4,000m2 / .5 to 1 sq. acre )"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Small Area, Dense (2,000m2 - 4,000m2 / .5 to1 sq. acre) */
-// autogenerated using string template disenumpart2.txt
-
     SMALL_AREA_DENSE_2_000M2_4_000M2_5_TO1_SQ_ACRE (223, "Small Area, Dense (2,000m2 - 4,000m2 / .5 to1 sq. acre)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium Area (20,000m2 - 41,000m2 / 10 to 20 sq. acres) */
-// autogenerated using string template disenumpart2.txt
-
     MEDIUM_AREA_20_000M2_41_000M2_10_TO_20_SQ_ACRES (224, "Medium Area (20,000m2 - 41,000m2 / 10 to 20 sq. acres)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium Area, Dense (20,000m2 - 41,000m2 / 10 to 20 sq. acres) */
-// autogenerated using string template disenumpart2.txt
-
     MEDIUM_AREA_DENSE_20_000M2_41_000M2_10_TO_20_SQ_ACRES (225, "Medium Area, Dense (20,000m2 - 41,000m2 / 10 to 20 sq. acres)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Large Area (40,000m2 - 81,000m2 / 20 to 40 sq. acres) */
-// autogenerated using string template disenumpart2.txt
-
     LARGE_AREA_40_000M2_81_000M2_20_TO_40_SQ_ACRES (226, "Large Area (40,000m2 - 81,000m2 / 20 to 40 sq. acres)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Large Area, Dense (40,000m2 - 81,000m2 / 20 to 40 sq. acres) */
-// autogenerated using string template disenumpart2.txt
-
-    LARGE_AREA_DENSE_40_000M2_81_000M2_20_TO_40_SQ_ACRES (227, "Large Area, Dense (40,000m2 - 81,000m2 / 20 to 40 sq. acres)"),;
-
-// autogenerated using string template disenumpart25.txt
+    LARGE_AREA_DENSE_40_000M2_81_000M2_20_TO_40_SQ_ACRES (227, "Large Area, Dense (40,000m2 - 81,000m2 / 20 to 40 sq. acres)");
 
     private int value;
     private final String description;
@@ -105,8 +77,6 @@ public enum SpecificDimensionEnumerationsforLandAreaSize
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SpotChaffStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/SpotChaffStatus.java
index 1aebc32b832b2820b6864a928d831f724febc5ea..561342108053e1bbaf1ea2e88dcd9d42f21d14bb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SpotChaffStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpotChaffStatus.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 404,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 404 marshal size 2<br>
  * SpotChaffStatus
  */
 public enum SpotChaffStatus 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** None */
-// autogenerated using string template disenumpart2.txt
-
     NONE (0, "None"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Deployed */
-// autogenerated using string template disenumpart2.txt
-
     DEPLOYED (1, "Deployed"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Malfunction */
-// autogenerated using string template disenumpart2.txt
-
-    MALFUNCTION (2, "Malfunction"),;
-
-// autogenerated using string template disenumpart25.txt
+    MALFUNCTION (2, "Malfunction");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum SpotChaffStatus
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeReason.java b/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeReason.java
index 80f96f98ad733df3c7c7a84ca01bf18c401b4eec..3035ac959323bc34461312b039e369c7e56f9cdd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeReason.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeReason.java
@@ -7,72 +7,31 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 67,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 67 marshal size 8<br>
  * StopFreezeReason
  */
 public enum StopFreezeReason 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Recess */
-// autogenerated using string template disenumpart2.txt
-
     RECESS (1, "Recess"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Termination */
-// autogenerated using string template disenumpart2.txt
-
     TERMINATION (2, "Termination"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** System Failure */
-// autogenerated using string template disenumpart2.txt
-
     SYSTEM_FAILURE (3, "System Failure"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Security Violation */
-// autogenerated using string template disenumpart2.txt
-
     SECURITY_VIOLATION (4, "Security Violation"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Entity Reconstitution */
-// autogenerated using string template disenumpart2.txt
-
     ENTITY_RECONSTITUTION (5, "Entity Reconstitution"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Stop for reset */
-// autogenerated using string template disenumpart2.txt
-
     STOP_FOR_RESET (6, "Stop for reset"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Stop for restart */
-// autogenerated using string template disenumpart2.txt
-
     STOP_FOR_RESTART (7, "Stop for restart"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Abort Training Return to Tactical Operations */
-// autogenerated using string template disenumpart2.txt
-
-    ABORT_TRAINING_RETURN_TO_TACTICAL_OPERATIONS (8, "Abort Training Return to Tactical Operations"),;
-
-// autogenerated using string template disenumpart25.txt
+    ABORT_TRAINING_RETURN_TO_TACTICAL_OPERATIONS (8, "Abort Training Return to Tactical Operations");
 
     private int value;
     private final String description;
@@ -122,8 +81,6 @@ public enum StopFreezeReason
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory200Bird.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory200Bird.java
index 65250cf5539519ca6d3d91889d07023898ff8acf..3124088a1032e9e6158b05310bc6537db2afb8bf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory200Bird.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory200Bird.java
@@ -7,180 +7,67 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 110,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 110 marshal size 8<br>
  * SubcategoriesforAirCategory200Bird
  */
 public enum SubcategoriesforAirCategory200Bird implements SubCategory
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Penguin, 1-49 Marine Birds */
-// autogenerated using string template disenumpart2.txt
-
     PENGUIN (1, "Penguin"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Seagull */
-// autogenerated using string template disenumpart2.txt
-
     SEAGULL (2, "Seagull"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pelican */
-// autogenerated using string template disenumpart2.txt
-
     PELICAN (3, "Pelican"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Albatross */
-// autogenerated using string template disenumpart2.txt
-
     ALBATROSS (4, "Albatross"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Swan */
-// autogenerated using string template disenumpart2.txt
-
     SWAN (5, "Swan"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cormorant */
-// autogenerated using string template disenumpart2.txt
-
     CORMORANT (6, "Cormorant"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Heron */
-// autogenerated using string template disenumpart2.txt
-
     HERON (7, "Heron"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Crane */
-// autogenerated using string template disenumpart2.txt
-
     CRANE (8, "Crane"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Osprey */
-// autogenerated using string template disenumpart2.txt
-
     OSPREY (9, "Osprey"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Loon */
-// autogenerated using string template disenumpart2.txt
-
     LOON (10, "Loon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Stork */
-// autogenerated using string template disenumpart2.txt
-
     STORK (11, "Stork"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Flamingo */
-// autogenerated using string template disenumpart2.txt
-
     FLAMINGO (12, "Flamingo"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Duck */
-// autogenerated using string template disenumpart2.txt
-
     DUCK (13, "Duck"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ostrich, 20-29 Flightless Land Birds */
-// autogenerated using string template disenumpart2.txt
-
     OSTRICH (20, "Ostrich"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Emu */
-// autogenerated using string template disenumpart2.txt
-
     EMU (21, "Emu"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Chicken */
-// autogenerated using string template disenumpart2.txt
-
     CHICKEN (22, "Chicken"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Black Bird, 30-39 Small birds that fly in large flocks */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Black Bird"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Starling */
-// autogenerated using string template disenumpart2.txt
-
     STARLING (31, "Starling"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Budgerigar (Parakeet) */
-// autogenerated using string template disenumpart2.txt
-
     BUDGERIGAR_PARAKEET (32, "Budgerigar (Parakeet)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Canadian Goose, 40-49 Large birds that fly in large flocks */
-// autogenerated using string template disenumpart2.txt
-
     CANADIAN_GOOSE (40, "Canadian Goose"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Crow */
-// autogenerated using string template disenumpart2.txt
-
     CROW (41, "Crow"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Eagle, 50-99 Birds of prey */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "Eagle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Vulture */
-// autogenerated using string template disenumpart2.txt
-
     ACKNOWLEDGE_RELIABLE (55, "Vulture"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Falcon */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "Falcon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hawk */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_QUERY_RELIABLE (65, "Hawk"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Owl */
-// autogenerated using string template disenumpart2.txt
-
     OWL (70, "Owl"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Kite */
-// autogenerated using string template disenumpart2.txt
-
-    KITE (80, "Kite"),;
-
-// autogenerated using string template disenumpart25.txt
+    KITE (80, "Kite");
 
     private int value;
     private final String description;
@@ -230,8 +117,6 @@ public enum SubcategoriesforAirCategory200Bird implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory201Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory201Insect.java
index e3a3d984abb976f9440e3ad3f29811560187eff6..33ef4ce1490f855fce824a0ddfdecbc1195fa021 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory201Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory201Insect.java
@@ -7,72 +7,31 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 111,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 111 marshal size 8<br>
  * SubcategoriesforAirCategory201Insect
  */
 public enum SubcategoriesforAirCategory201Insect implements SubCategory
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Moth, 1-19 Moth/Butterfly */
-// autogenerated using string template disenumpart2.txt
-
     MOTH (1, "Moth"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Butterfly */
-// autogenerated using string template disenumpart2.txt
-
     BUTTERFLY (2, "Butterfly"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fly, 20-29 Fly/Midge */
-// autogenerated using string template disenumpart2.txt
-
     FLY (20, "Fly"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mosquito, 30-39 Mosquito/Gnat */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Mosquito"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Wasp, 40-49 Wasp/Hornet */
-// autogenerated using string template disenumpart2.txt
-
     WASP (40, "Wasp"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bee, 50-59 Bee */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "Bee"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Beetle, 60-69 Beetle */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "Beetle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dragonfly, 70-79 Dragonfly/Damselfly */
-// autogenerated using string template disenumpart2.txt
-
     DRAGONFLY (70, "Dragonfly"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Locust, 80-89 Locust */
-// autogenerated using string template disenumpart2.txt
-
-    LOCUST (80, "Locust"),;
-
-// autogenerated using string template disenumpart25.txt
+    LOCUST (80, "Locust");
 
     private int value;
     private final String description;
@@ -122,8 +81,6 @@ public enum SubcategoriesforAirCategory201Insect implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory202Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory202Mammal.java
index 3a5b9a20e56282ea5f4878e94473a46e3a969c79..06a4300b91c2f61685ac1f24325c5f4c83595e5d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory202Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory202Mammal.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 112,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 112 marshal size 8<br>
  * SubcategoriesforAirCategory202Mammal
  */
 public enum SubcategoriesforAirCategory202Mammal implements SubCategory
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bat */
-// autogenerated using string template disenumpart2.txt
-
     BAT (1, "Bat"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Flying Squirrel */
-// autogenerated using string template disenumpart2.txt
-
     FLYING_SQUIRREL (10, "Flying Squirrel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Gliding Possum */
-// autogenerated using string template disenumpart2.txt
-
-    GLIDING_POSSUM (20, "Gliding Possum"),;
-
-// autogenerated using string template disenumpart25.txt
+    GLIDING_POSSUM (20, "Gliding Possum");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum SubcategoriesforAirCategory202Mammal implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory200Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory200Mammal.java
index 3a0f724e849315b0bb82141e7ccf1b24d258cee2..a5afe52207a53d532e60debcb785bccce23aa5d8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory200Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory200Mammal.java
@@ -7,193 +7,73 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 100, marshal size 8,
- * SubcategoriesforLandCategory200Mammal
+ * Generated from XML, <br>
+ * UID 100 marshal size 8<br>
+ * SubcategoriesforLandCategory200Mammal<br>
  * 1-199 Domesticated animals, 200-255 Wild animals
  */
 public enum SubcategoriesforLandCategory200Mammal implements SubCategory
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Small Dog, 1-9 Small dog (22cm/4kg) */
-// autogenerated using string template disenumpart2.txt
-
     SMALL_DOG (1, "Small Dog"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Chihuahua */
-// autogenerated using string template disenumpart2.txt
-
     CHIHUAHUA (2, "Chihuahua"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium Dog, 10-19 Medium dog (50cm/16kg) */
-// autogenerated using string template disenumpart2.txt
-
     MEDIUM_DOG (10, "Medium Dog"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Australian Cattle Dog */
-// autogenerated using string template disenumpart2.txt
-
     AUSTRALIAN_CATTLE_DOG (11, "Australian Cattle Dog"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Large Dog, 20-29 Large dog (65cm/40kg) */
-// autogenerated using string template disenumpart2.txt
-
     LARGE_DOG (20, "Large Dog"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** German Shepherd */
-// autogenerated using string template disenumpart2.txt
-
     GERMAN_SHEPHERD (21, "German Shepherd"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Very Large Dog, 30-39 Very large dog(76cm/61kg) */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Very Large Dog"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Giant Turkish Kangal */
-// autogenerated using string template disenumpart2.txt
-
     GIANT_TURKISH_KANGAL (31, "Giant Turkish Kangal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sheep, 40-49 Small Livestock (sheep/ goat) */
-// autogenerated using string template disenumpart2.txt
-
     SHEEP (40, "Sheep"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Goat */
-// autogenerated using string template disenumpart2.txt
-
     GOAT (41, "Goat"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pig, 50-59 Pig */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "Pig"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cow, 60-69 Medium Livestock (cow/steer/bull/oxen) */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "Cow"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ox */
-// autogenerated using string template disenumpart2.txt
-
     EVENT_REPORT_RELIABLE (61, "Ox"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Ox With Cart, 70-79 Medium Livestock harnessed (cart/plow) */
-// autogenerated using string template disenumpart2.txt
-
     OX_WITH_CART (70, "Ox With Cart"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Horse, 80-89 Horse/mule/donkey */
-// autogenerated using string template disenumpart2.txt
-
     HORSE (80, "Horse"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Donkey */
-// autogenerated using string template disenumpart2.txt
-
     DONKEY (81, "Donkey"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mule */
-// autogenerated using string template disenumpart2.txt
-
     MULE (82, "Mule"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Horse With Rider, 90-99 Horse/mule/donkey with rider or cargo */
-// autogenerated using string template disenumpart2.txt
-
     HORSE_WITH_RIDER (90, "Horse With Rider"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Horse With Cargo */
-// autogenerated using string template disenumpart2.txt
-
     HORSE_WITH_CARGO (91, "Horse With Cargo"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Donkey With Rider */
-// autogenerated using string template disenumpart2.txt
-
     DONKEY_WITH_RIDER (92, "Donkey With Rider"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Donkey With Cargo */
-// autogenerated using string template disenumpart2.txt
-
     DONKEY_WITH_CARGO (93, "Donkey With Cargo"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mule With Rider */
-// autogenerated using string template disenumpart2.txt
-
     MULE_WITH_RIDER (94, "Mule With Rider"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mule With Cargo */
-// autogenerated using string template disenumpart2.txt
-
     MULE_WITH_CARGO (95, "Mule With Cargo"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Camel, 100-109 Camel */
-// autogenerated using string template disenumpart2.txt
-
     CAMEL (100, "Camel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dromedary Camel (One Hump) */
-// autogenerated using string template disenumpart2.txt
-
     DROMEDARY_CAMEL_ONE_HUMP (101, "Dromedary Camel (One Hump)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bactrian Camel (Two Humps) */
-// autogenerated using string template disenumpart2.txt
-
     BACTRIAN_CAMEL_TWO_HUMPS (102, "Bactrian Camel (Two Humps)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dromedary Camel With Rider, 110-119 Camel with rider or cargo */
-// autogenerated using string template disenumpart2.txt
-
     DROMEDARY_CAMEL_WITH_RIDER (110, "Dromedary Camel With Rider"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dromedary Camel With Cargo */
-// autogenerated using string template disenumpart2.txt
-
     DROMEDARY_CAMEL_WITH_CARGO (111, "Dromedary Camel With Cargo"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Rat, 200-209 Rodent */
-// autogenerated using string template disenumpart2.txt
-
-    RAT (200, "Rat"),;
-
-// autogenerated using string template disenumpart25.txt
+    RAT (200, "Rat");
 
     private int value;
     private final String description;
@@ -243,8 +123,6 @@ public enum SubcategoriesforLandCategory200Mammal implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory201Reptile.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory201Reptile.java
index 3e095e8760217ae8162f16bc1de0f7847bfffdef..78837f4cc29cb2bebc4f63891dddbb0fee30b94c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory201Reptile.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory201Reptile.java
@@ -7,156 +7,59 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 101,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 101 marshal size 8<br>
  * SubcategoriesforLandCategory201Reptile
  */
 public enum SubcategoriesforLandCategory201Reptile implements SubCategory
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** New Zealand Northern Tuatara, 1-29 Lizard/tuatara */
-// autogenerated using string template disenumpart2.txt
-
     NEW_ZEALAND_NORTHERN_TUATARA (1, "New Zealand Northern Tuatara"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Monitor */
-// autogenerated using string template disenumpart2.txt
-
     MONITOR (3, "Monitor"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Gecko */
-// autogenerated using string template disenumpart2.txt
-
     GECKO (8, "Gecko"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Iguana */
-// autogenerated using string template disenumpart2.txt
-
     IGUANA (13, "Iguana"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Chameleon */
-// autogenerated using string template disenumpart2.txt
-
     CHAMELEON (17, "Chameleon"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Non-Venomous Snake, 30-59 Non-venomous snake */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Non-Venomous Snake"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Boa */
-// autogenerated using string template disenumpart2.txt
-
     BOA (31, "Boa"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Python */
-// autogenerated using string template disenumpart2.txt
-
     PYTHON (35, "Python"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bullsnake */
-// autogenerated using string template disenumpart2.txt
-
     BULLSNAKE (39, "Bullsnake"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Kingsnake */
-// autogenerated using string template disenumpart2.txt
-
     KINGSNAKE (43, "Kingsnake"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Venomous Snake, 60-89 Venomous snake */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "Venomous Snake"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Rattlesnake */
-// autogenerated using string template disenumpart2.txt
-
     EVENT_REPORT_RELIABLE (61, "Rattlesnake"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Copperhead */
-// autogenerated using string template disenumpart2.txt
-
     COMMENT_RELIABLE (62, "Copperhead"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cottonmouth */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_RELIABLE (63, "Cottonmouth"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Taipan */
-// autogenerated using string template disenumpart2.txt
-
     SET_RECORD_RELIABLE	 (64, "Taipan"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Viper */
-// autogenerated using string template disenumpart2.txt
-
     RECORD_QUERY_RELIABLE (65, "Viper"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cobra */
-// autogenerated using string template disenumpart2.txt
-
     COBRA (66, "Cobra"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Australian Brown Snake */
-// autogenerated using string template disenumpart2.txt
-
     AUSTRALIAN_BROWN_SNAKE (67, "Australian Brown Snake"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tortoise, 90-119 Turtle/Tortoise */
-// autogenerated using string template disenumpart2.txt
-
     TORTOISE (90, "Tortoise"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Turtle */
-// autogenerated using string template disenumpart2.txt
-
     TURTLE (100, "Turtle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** American Alligator, 120-149 Crocodilian */
-// autogenerated using string template disenumpart2.txt
-
     AMERICAN_ALLIGATOR (120, "American Alligator"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Crocodile */
-// autogenerated using string template disenumpart2.txt
-
     CROCODILE (121, "Crocodile"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Australian Freshwater Crocodile */
-// autogenerated using string template disenumpart2.txt
-
-    AUSTRALIAN_FRESHWATER_CROCODILE (122, "Australian Freshwater Crocodile"),;
-
-// autogenerated using string template disenumpart25.txt
+    AUSTRALIAN_FRESHWATER_CROCODILE (122, "Australian Freshwater Crocodile");
 
     private int value;
     private final String description;
@@ -206,8 +109,6 @@ public enum SubcategoriesforLandCategory201Reptile implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory202Amphibian.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory202Amphibian.java
index 416391fb32f9b78840f4a3426f92b1999aad3c8a..cfe947560dd533d99089503605afa35a2e31bdbf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory202Amphibian.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory202Amphibian.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 102,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 102 marshal size 8<br>
  * SubcategoriesforLandCategory202Amphibian
  */
 public enum SubcategoriesforLandCategory202Amphibian implements SubCategory
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Frog, 1-169 Frog/Toad */
-// autogenerated using string template disenumpart2.txt
-
     FROG (1, "Frog"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Toad */
-// autogenerated using string template disenumpart2.txt
-
     TOAD (2, "Toad"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Salamander, 170-229 Salamander/Newt */
-// autogenerated using string template disenumpart2.txt
-
     SALAMANDER (170, "Salamander"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Caecilian, 230-255 Caecilian */
-// autogenerated using string template disenumpart2.txt
-
-    CAECILIAN (230, "Caecilian"),;
-
-// autogenerated using string template disenumpart25.txt
+    CAECILIAN (230, "Caecilian");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum SubcategoriesforLandCategory202Amphibian implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory203Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory203Insect.java
index 1cb19d5de905fee1272d46d820ff879130b19aba..5600cc7372455cdf0305fbbeb8a259bdfd201bd1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory203Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory203Insect.java
@@ -7,60 +7,27 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 103,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 103 marshal size 8<br>
  * SubcategoriesforLandCategory203Insect
  */
 public enum SubcategoriesforLandCategory203Insect implements SubCategory
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Beetle, 1-59 Beetle/Weevil */
-// autogenerated using string template disenumpart2.txt
-
     BEETLE (1, "Beetle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mantis, 60-69 Mantis */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "Mantis"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cockroach, 70-79 Cockroach */
-// autogenerated using string template disenumpart2.txt
-
     COCKROACH (70, "Cockroach"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Army Ant, 80-89 Ant */
-// autogenerated using string template disenumpart2.txt
-
     ARMY_ANT (80, "Army Ant"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fire Ant */
-// autogenerated using string template disenumpart2.txt
-
     FIRE_ANT (81, "Fire Ant"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Grasshopper, 90-99 Grasshopper/Cricket/Katydid */
-// autogenerated using string template disenumpart2.txt
-
     GRASSHOPPER (90, "Grasshopper"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Centipede, 100-109 Centipede/Millipede */
-// autogenerated using string template disenumpart2.txt
-
-    CENTIPEDE (100, "Centipede"),;
-
-// autogenerated using string template disenumpart25.txt
+    CENTIPEDE (100, "Centipede");
 
     private int value;
     private final String description;
@@ -110,8 +77,6 @@ public enum SubcategoriesforLandCategory203Insect implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory204Arachnid.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory204Arachnid.java
index 08c74c6114b5edfefb7748e1bfecc10942fc4064..10d9f59b339d3c99728b12acd1fdd95c1aecdd3f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory204Arachnid.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory204Arachnid.java
@@ -7,48 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 104,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 104 marshal size 8<br>
  * SubcategoriesforLandCategory204Arachnid
  */
 public enum SubcategoriesforLandCategory204Arachnid implements SubCategory
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Spider, 1-19 Spider */
-// autogenerated using string template disenumpart2.txt
-
     SPIDER (1, "Spider"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tick, 20-29 Tick */
-// autogenerated using string template disenumpart2.txt
-
     TICK (20, "Tick"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Scorpion, 30-39 Scorpion */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Scorpion"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Harvestmen, 40-49 Harvestmen */
-// autogenerated using string template disenumpart2.txt
-
     HARVESTMEN (40, "Harvestmen"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mite, 50-59 Mite */
-// autogenerated using string template disenumpart2.txt
-
-    LIVE_ENTITY_DETONATION (50, "Mite"),;
-
-// autogenerated using string template disenumpart25.txt
+    LIVE_ENTITY_DETONATION (50, "Mite");
 
     private int value;
     private final String description;
@@ -98,8 +73,6 @@ public enum SubcategoriesforLandCategory204Arachnid implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory205Mollusk.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory205Mollusk.java
index 1bf00f7d3d3f702f81e5bcdf11113eb3c3fba713..0f999eb07ccd6732ad9aaa3e03484aa9ef1cf497 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory205Mollusk.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory205Mollusk.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 105,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 105 marshal size 8<br>
  * SubcategoriesforLandCategory205Mollusk
  */
 public enum SubcategoriesforLandCategory205Mollusk implements SubCategory
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Snail, 1-49 Snail */
-// autogenerated using string template disenumpart2.txt
-
     SNAIL (1, "Snail"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Slug, 50-99 Slug */
-// autogenerated using string template disenumpart2.txt
-
-    LIVE_ENTITY_DETONATION (50, "Slug"),;
-
-// autogenerated using string template disenumpart25.txt
+    LIVE_ENTITY_DETONATION (50, "Slug");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum SubcategoriesforLandCategory205Mollusk implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory206Marsupial.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory206Marsupial.java
index a48c3f9c8ab587fc07f5d370b788c7c41a5eb63b..8862d9728b91ef426881bcca671294670c73d4f8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory206Marsupial.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory206Marsupial.java
@@ -7,91 +7,39 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 106, marshal size 8,
- * SubcategoriesforLandCategory206Marsupial
+ * Generated from XML, <br>
+ * UID 106 marshal size 8<br>
+ * SubcategoriesforLandCategory206Marsupial<br>
  * 1-99 Ameridelphia, 100-250 Australidelphia
  */
 public enum SubcategoriesforLandCategory206Marsupial 
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Brown Four-Eyed Opossum, 1-89 Opossum */
-// autogenerated using string template disenumpart2.txt
-
     BROWN_FOUR_EYED_OPOSSUM (1, "Brown Four-Eyed Opossum"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bushy-Tailed Opossum */
-// autogenerated using string template disenumpart2.txt
-
     BUSHY_TAILED_OPOSSUM (2, "Bushy-Tailed Opossum"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tates Shrew Opossum, 90-99 Shrew Opossum */
-// autogenerated using string template disenumpart2.txt
-
     TATES_SHREW_OPOSSUM (90, "Tates Shrew Opossum"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Greater Bilby, 100-109 Bandicoots and Bilbies */
-// autogenerated using string template disenumpart2.txt
-
     GREATER_BILBY (100, "Greater Bilby"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tasmanian Devil, 110-149 Carnivorous Marsupials */
-// autogenerated using string template disenumpart2.txt
-
     TASMANIAN_DEVIL (110, "Tasmanian Devil"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Brush-Tailed Rock-Wallaby, 150-199 Wallabies, Wallaroos and Kangaroos */
-// autogenerated using string template disenumpart2.txt
-
     BRUSH_TAILED_ROCK_WALLABY (150, "Brush-Tailed Rock-Wallaby"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Eastern Wallaroo */
-// autogenerated using string template disenumpart2.txt
-
     EASTERN_WALLAROO (160, "Eastern Wallaroo"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Red Kangaroo */
-// autogenerated using string template disenumpart2.txt
-
     RED_KANGAROO (170, "Red Kangaroo"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Queensland Koala, 200-204 Koalas */
-// autogenerated using string template disenumpart2.txt
-
     QUEENSLAND_KOALA (200, "Queensland Koala"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Southern Hairy-Nosed Wombat, 205-209 Wombats */
-// autogenerated using string template disenumpart2.txt
-
     SOUTHERN_HAIRY_NOSED_WOMBAT (205, "Southern Hairy-Nosed Wombat"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Brushtail Possum, 210-249 Possums, Gliders, and Cuscus */
-// autogenerated using string template disenumpart2.txt
-
     BRUSHTAIL_POSSUM (210, "Brushtail Possum"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sugar Glider */
-// autogenerated using string template disenumpart2.txt
-
-    SUGAR_GLIDER (211, "Sugar Glider"),;
-
-// autogenerated using string template disenumpart25.txt
+    SUGAR_GLIDER (211, "Sugar Glider");
 
     private int value;
     private final String description;
@@ -141,8 +89,6 @@ public enum SubcategoriesforLandCategory206Marsupial
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java
index c4d063888828b13b799d6cc1c2ef11cf05468b26..f1eab6f40fac32d10d0c8501a144ff4472373e10 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java
@@ -7,180 +7,67 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 120,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 120 marshal size 8<br>
  * SubcategoriesforSubsurfaceCategory200Fish
  */
 public enum SubcategoriesforSubsurfaceCategory200Fish implements SubCategory
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Forage Fish, Small Schooling, 1-29 Small size schooling (forage) fish (herring-like, sardines, squid, krill) */
-// autogenerated using string template disenumpart2.txt
-
     FORAGE_FISH_SMALL_SCHOOLING (1, "Forage Fish, Small Schooling"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Herring */
-// autogenerated using string template disenumpart2.txt
-
     HERRING (2, "Herring"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sardines */
-// autogenerated using string template disenumpart2.txt
-
     SARDINES (3, "Sardines"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Krill */
-// autogenerated using string template disenumpart2.txt
-
     KRILL (4, "Krill"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Squid */
-// autogenerated using string template disenumpart2.txt
-
     SQUID (5, "Squid"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium Schooling Fish, 30-59 Medium size schooling fish (cod-like, hake, haddock) */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Medium Schooling Fish"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hake */
-// autogenerated using string template disenumpart2.txt
-
     HAKE (31, "Hake"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cod */
-// autogenerated using string template disenumpart2.txt
-
     COD (32, "Cod"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Haddock */
-// autogenerated using string template disenumpart2.txt
-
     HADDOCK (33, "Haddock"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mackerel */
-// autogenerated using string template disenumpart2.txt
-
     MACKEREL (34, "Mackerel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Large Schooling Fish, 60-89 Large size schooling fish (tuna) */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "Large Schooling Fish"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tuna */
-// autogenerated using string template disenumpart2.txt
-
     EVENT_REPORT_RELIABLE (61, "Tuna"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Small Shark, 90-119 Small shark */
-// autogenerated using string template disenumpart2.txt
-
     SMALL_SHARK (90, "Small Shark"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dogfish Shark */
-// autogenerated using string template disenumpart2.txt
-
     DOGFISH_SHARK (91, "Dogfish Shark"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium Shark, 120-149 Medium shark */
-// autogenerated using string template disenumpart2.txt
-
     MEDIUM_SHARK (120, "Medium Shark"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mako Shark */
-// autogenerated using string template disenumpart2.txt
-
     MAKO_SHARK (121, "Mako Shark"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Hammerhead Shark */
-// autogenerated using string template disenumpart2.txt
-
     HAMMERHEAD_SHARK (122, "Hammerhead Shark"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Large Shark, 150-179 Large to vary large shark */
-// autogenerated using string template disenumpart2.txt
-
     LARGE_SHARK (150, "Large Shark"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Great White Shark */
-// autogenerated using string template disenumpart2.txt
-
     GREAT_WHITE_SHARK (151, "Great White Shark"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Tiger Shark */
-// autogenerated using string template disenumpart2.txt
-
     TIGER_SHARK (152, "Tiger Shark"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Blue Shark */
-// autogenerated using string template disenumpart2.txt
-
     BLUE_SHARK (153, "Blue Shark"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Whale Shark */
-// autogenerated using string template disenumpart2.txt
-
     WHALE_SHARK (154, "Whale Shark"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Skate, 180-189 Skate/Ray */
-// autogenerated using string template disenumpart2.txt
-
     SKATE (180, "Skate"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Stingray */
-// autogenerated using string template disenumpart2.txt
-
     STINGRAY (181, "Stingray"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Eel, 190-199 Eel */
-// autogenerated using string template disenumpart2.txt
-
     EEL (190, "Eel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Marlin, 200-255 Other fish */
-// autogenerated using string template disenumpart2.txt
-
     MARLIN (200, "Marlin"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Swordfish */
-// autogenerated using string template disenumpart2.txt
-
-    SWORDFISH (201, "Swordfish"),;
-
-// autogenerated using string template disenumpart25.txt
+    SWORDFISH (201, "Swordfish");
 
     private int value;
     private final String description;
@@ -230,8 +117,6 @@ public enum SubcategoriesforSubsurfaceCategory200Fish implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java
index af84f665fb5c42868462a4acabc6399486a1aa4e..f43c9ca7edee3c74aa05a9c684e6ad5361d3cdc6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java
@@ -7,372 +7,131 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 121,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 121 marshal size 8<br>
  * SubcategoriesforSubsurfaceCategory201Mammal
  */
 public enum SubcategoriesforSubsurfaceCategory201Mammal implements SubCategory
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Whale, 1-49 Whale */
-// autogenerated using string template disenumpart2.txt
-
     WHALE (1, "Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Beaked Whale */
-// autogenerated using string template disenumpart2.txt
-
     BEAKED_WHALE (2, "Beaked Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Beluga Whale */
-// autogenerated using string template disenumpart2.txt
-
     BELUGA_WHALE (3, "Beluga Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Blue Whale */
-// autogenerated using string template disenumpart2.txt
-
     BLUE_WHALE (4, "Blue Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bottlenose Whale */
-// autogenerated using string template disenumpart2.txt
-
     BOTTLENOSE_WHALE (5, "Bottlenose Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Northern Bottlenose Whale */
-// autogenerated using string template disenumpart2.txt
-
     NORTHERN_BOTTLENOSE_WHALE (6, "Northern Bottlenose Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Southern Bottlenose Whale */
-// autogenerated using string template disenumpart2.txt
-
     SOUTHERN_BOTTLENOSE_WHALE (7, "Southern Bottlenose Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bowhead Whale */
-// autogenerated using string template disenumpart2.txt
-
     BOWHEAD_WHALE (8, "Bowhead Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Brydes Whale */
-// autogenerated using string template disenumpart2.txt
-
     BRYDES_WHALE (9, "Brydes Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dwarf Sperm Whale */
-// autogenerated using string template disenumpart2.txt
-
     DWARF_SPERM_WHALE (10, "Dwarf Sperm Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Finback Whale */
-// autogenerated using string template disenumpart2.txt
-
     FINBACK_WHALE (11, "Finback Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Gray Whale */
-// autogenerated using string template disenumpart2.txt
-
     GRAY_WHALE (12, "Gray Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Humpback Whale */
-// autogenerated using string template disenumpart2.txt
-
     HUMPBACK_WHALE (13, "Humpback Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Long-Finned Pilot Whale */
-// autogenerated using string template disenumpart2.txt
-
     LONG_FINNED_PILOT_WHALE (14, "Long-Finned Pilot Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Minke Whale */
-// autogenerated using string template disenumpart2.txt
-
     MINKE_WHALE (15, "Minke Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Northern Minke Whale */
-// autogenerated using string template disenumpart2.txt
-
     NORTHERN_MINKE_WHALE (16, "Northern Minke Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Southern Minke Whale */
-// autogenerated using string template disenumpart2.txt
-
     SOUTHERN_MINKE_WHALE (17, "Southern Minke Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Narwhal Whale */
-// autogenerated using string template disenumpart2.txt
-
     NARWHAL_WHALE (18, "Narwhal Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Orca Whale */
-// autogenerated using string template disenumpart2.txt
-
     ORCA_WHALE (19, "Orca Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pygmy Sperm Whale */
-// autogenerated using string template disenumpart2.txt
-
     PYGMY_SPERM_WHALE (20, "Pygmy Sperm Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Right Whale */
-// autogenerated using string template disenumpart2.txt
-
     RIGHT_WHALE (21, "Right Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** North Atlantic Right Whale */
-// autogenerated using string template disenumpart2.txt
-
     NORTH_ATLANTIC_RIGHT_WHALE (22, "North Atlantic Right Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** North Pacific Right Whale */
-// autogenerated using string template disenumpart2.txt
-
     NORTH_PACIFIC_RIGHT_WHALE (23, "North Pacific Right Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Southern Right Whale */
-// autogenerated using string template disenumpart2.txt
-
     SOUTHERN_RIGHT_WHALE (24, "Southern Right Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sei Whale */
-// autogenerated using string template disenumpart2.txt
-
     SEI_WHALE (25, "Sei Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Short-Finned Pilot Whale */
-// autogenerated using string template disenumpart2.txt
-
     SHORT_FINNED_PILOT_WHALE (26, "Short-Finned Pilot Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sperm Whale */
-// autogenerated using string template disenumpart2.txt
-
     SPERM_WHALE (27, "Sperm Whale"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dolphin, 50-99 Dolphin */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "Dolphin"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bottlenose Dolphin */
-// autogenerated using string template disenumpart2.txt
-
     CREATE_ENTITY_RELIABLE (51, "Bottlenose Dolphin"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bottlenose Indo-Pacific Dolphin */
-// autogenerated using string template disenumpart2.txt
-
     REMOVE_ENTITY_RELIABLE (52, "Bottlenose Indo-Pacific Dolphin"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bottlenose Burrunan Dolphin */
-// autogenerated using string template disenumpart2.txt
-
     START_RESUME_RELIABLE (53, "Bottlenose Burrunan Dolphin"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Atlantic Spotted Dolphin */
-// autogenerated using string template disenumpart2.txt
-
     STOP_FREEZE_RELIABLE (54, "Atlantic Spotted Dolphin"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Australian Snubfin Dolphin */
-// autogenerated using string template disenumpart2.txt
-
     ACKNOWLEDGE_RELIABLE (55, "Australian Snubfin Dolphin"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Chilean Black Dolphin */
-// autogenerated using string template disenumpart2.txt
-
     ACTION_REQUEST_RELIABLE (56, "Chilean Black Dolphin"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Chinese White Dolphin */
-// autogenerated using string template disenumpart2.txt
-
     ACTION_RESPONSE_RELIABLE (57, "Chinese White Dolphin"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Clymene Dolphin */
-// autogenerated using string template disenumpart2.txt
-
     DATA_QUERY_RELIABLE (58, "Clymene Dolphin"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Porpoise, 100-119 Porpoise */
-// autogenerated using string template disenumpart2.txt
-
     PORPOISE (100, "Porpoise"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Harbour Porpoise */
-// autogenerated using string template disenumpart2.txt
-
     HARBOUR_PORPOISE (101, "Harbour Porpoise"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Californian Porpoise */
-// autogenerated using string template disenumpart2.txt
-
     CALIFORNIAN_PORPOISE (102, "Californian Porpoise"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dalls Porpoise */
-// autogenerated using string template disenumpart2.txt
-
     DALLS_PORPOISE (103, "Dalls Porpoise"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Burmeisters Porpoise */
-// autogenerated using string template disenumpart2.txt
-
     BURMEISTERS_PORPOISE (104, "Burmeisters Porpoise"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Seal, 120-129 Seal */
-// autogenerated using string template disenumpart2.txt
-
     SEAL (120, "Seal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bearded Seal */
-// autogenerated using string template disenumpart2.txt
-
     BEARDED_SEAL (121, "Bearded Seal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Harbor Seal */
-// autogenerated using string template disenumpart2.txt
-
     HARBOR_SEAL (122, "Harbor Seal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fur Seal */
-// autogenerated using string template disenumpart2.txt
-
     FUR_SEAL (123, "Fur Seal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Weddell Seal */
-// autogenerated using string template disenumpart2.txt
-
     WEDDELL_SEAL (124, "Weddell Seal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Elephant Seal */
-// autogenerated using string template disenumpart2.txt
-
     ELEPHANT_SEAL (125, "Elephant Seal"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sea Lion, 130-139 Sea Lion */
-// autogenerated using string template disenumpart2.txt
-
     SEA_LION (130, "Sea Lion"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Australian Sea Lion */
-// autogenerated using string template disenumpart2.txt
-
     AUSTRALIAN_SEA_LION (131, "Australian Sea Lion"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** California Sea Lion */
-// autogenerated using string template disenumpart2.txt
-
     CALIFORNIA_SEA_LION (132, "California Sea Lion"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Walrus, 140-149 Walrus */
-// autogenerated using string template disenumpart2.txt
-
     WALRUS (140, "Walrus"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Atlantic Walrus */
-// autogenerated using string template disenumpart2.txt
-
     ATLANTIC_WALRUS (141, "Atlantic Walrus"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pacific Walrus */
-// autogenerated using string template disenumpart2.txt
-
     PACIFIC_WALRUS (142, "Pacific Walrus"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Otter, 150-159 Otter */
-// autogenerated using string template disenumpart2.txt
-
     OTTER (150, "Otter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sea Otter */
-// autogenerated using string template disenumpart2.txt
-
     SEA_OTTER (151, "Sea Otter"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Manatee, 160-164 Manatee */
-// autogenerated using string template disenumpart2.txt
-
     MANATEE (160, "Manatee"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Florida Manatee */
-// autogenerated using string template disenumpart2.txt
-
     FLORIDA_MANATEE (161, "Florida Manatee"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Dugongs */
-// autogenerated using string template disenumpart2.txt
-
     DUGONGS (162, "Dugongs"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Polar Bear, 200-255 Other Mammals */
-// autogenerated using string template disenumpart2.txt
-
-    POLAR_BEAR (200, "Polar Bear"),;
-
-// autogenerated using string template disenumpart25.txt
+    POLAR_BEAR (200, "Polar Bear");
 
     private int value;
     private final String description;
@@ -422,8 +181,6 @@ public enum SubcategoriesforSubsurfaceCategory201Mammal implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java
index 09c0c35ed7d44efa8f4dad0e26857aaf448adcb7..bec91fe1d41b71aaf20f4ef53da69e0cfd9678bd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java
@@ -7,72 +7,31 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 122,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 122 marshal size 8<br>
  * SubcategoriesforSubsurfaceCategory202Mollusk
  */
 public enum SubcategoriesforSubsurfaceCategory202Mollusk implements SubCategory
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Snail */
-// autogenerated using string template disenumpart2.txt
-
     SNAIL (1, "Snail"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Slug */
-// autogenerated using string template disenumpart2.txt
-
     SLUG (10, "Slug"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Octopus */
-// autogenerated using string template disenumpart2.txt
-
     OCTOPUS (20, "Octopus"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Squid */
-// autogenerated using string template disenumpart2.txt
-
     SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Squid"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cuttlefish */
-// autogenerated using string template disenumpart2.txt
-
     CUTTLEFISH (40, "Cuttlefish"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Clam */
-// autogenerated using string template disenumpart2.txt
-
     LIVE_ENTITY_DETONATION (50, "Clam"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Muscle */
-// autogenerated using string template disenumpart2.txt
-
     DATA_RELIABLE (60, "Muscle"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Oyster */
-// autogenerated using string template disenumpart2.txt
-
     OYSTER (70, "Oyster"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Scallop */
-// autogenerated using string template disenumpart2.txt
-
-    SCALLOP (80, "Scallop"),;
-
-// autogenerated using string template disenumpart25.txt
+    SCALLOP (80, "Scallop");
 
     private int value;
     private final String description;
@@ -122,8 +81,6 @@ public enum SubcategoriesforSubsurfaceCategory202Mollusk implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java
index dbc901781e51a4533836d5c0fb86e3fdc33ae22a..614abf9e117bff5f95c90e74958d26bf0b8bb450 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java
@@ -7,48 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 123,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 123 marshal size 8<br>
  * SubcategoriesforSubsurfaceCategory203Crustacean
  */
 public enum SubcategoriesforSubsurfaceCategory203Crustacean implements SubCategory
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Shrimp */
-// autogenerated using string template disenumpart2.txt
-
     SHRIMP (1, "Shrimp"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Snapping Shrimp */
-// autogenerated using string template disenumpart2.txt
-
     SNAPPING_SHRIMP (2, "Snapping Shrimp"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Crayfish */
-// autogenerated using string template disenumpart2.txt
-
     CRAYFISH (10, "Crayfish"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Lobster */
-// autogenerated using string template disenumpart2.txt
-
     LOBSTER (20, "Lobster"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Crab */
-// autogenerated using string template disenumpart2.txt
-
-    SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Crab"),;
-
-// autogenerated using string template disenumpart25.txt
+    SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Crab");
 
     private int value;
     private final String description;
@@ -98,8 +73,6 @@ public enum SubcategoriesforSubsurfaceCategory203Crustacean implements SubCatego
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java
index cb4f09a7781a0b8624f8f72ca5744dbd74d985f6..e392643ccd921aef95784d076df4ae93d1b304ef 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 124,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 124 marshal size 8<br>
  * SubcategoriesforSubsurfaceCategory204Insect
  */
 public enum SubcategoriesforSubsurfaceCategory204Insect implements SubCategory
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Sea Skater */
-// autogenerated using string template disenumpart2.txt
-
     SEA_SKATER (1, "Sea Skater"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Water Beetle */
-// autogenerated using string template disenumpart2.txt
-
-    WATER_BEETLE (2, "Water Beetle"),;
-
-// autogenerated using string template disenumpart25.txt
+    WATER_BEETLE (2, "Water Beetle");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum SubcategoriesforSubsurfaceCategory204Insect implements SubCategory
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SupplyDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/SupplyDomain.java
index 8172e2a49195ff5360e508b87e23bbf398e923fa..ea023308c5a6627765722294e4795b05fd949870 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SupplyDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SupplyDomain.java
@@ -7,96 +7,39 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 600,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 600 marshal size 8<br>
  * SupplyDomain
  */
 public enum SupplyDomain 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Used */
-// autogenerated using string template disenumpart2.txt
-
     NOT_USED (0, "Not Used"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Class 1 - Subsistence */
-// autogenerated using string template disenumpart2.txt
-
     CLASS_1_SUBSISTENCE (1, "Class 1 - Subsistence"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Class 2 - Clothing, Individual Equipment, Tools, Admin. Supplies */
-// autogenerated using string template disenumpart2.txt
-
     CLASS_2_CLOTHING_INDIVIDUAL_EQUIPMENT_TOOLS_ADMIN_SUPPLIES (2, "Class 2 - Clothing, Individual Equipment, Tools, Admin. Supplies"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Class 3 - Petroleum, Oils, Lubricants */
-// autogenerated using string template disenumpart2.txt
-
     CLASS_3_PETROLEUM_OILS_LUBRICANTS (3, "Class 3 - Petroleum, Oils, Lubricants"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Class 4 - Construction Materials */
-// autogenerated using string template disenumpart2.txt
-
     CLASS_4_CONSTRUCTION_MATERIALS (4, "Class 4 - Construction Materials"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Class 5 - Ammunition, Not used, as it is described in Munitions. */
-// autogenerated using string template disenumpart2.txt
-
     CLASS_5_AMMUNITION (5, "Class 5 - Ammunition"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Class 6 - Personnel Demand Items */
-// autogenerated using string template disenumpart2.txt
-
     CLASS_6_PERSONNEL_DEMAND_ITEMS (6, "Class 6 - Personnel Demand Items"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Class 7 - Major Items, Only used for add on equipment like bomb racks. */
-// autogenerated using string template disenumpart2.txt
-
     CLASS_7_MAJOR_ITEMS (7, "Class 7 - Major Items"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Class 8 - Medical Material */
-// autogenerated using string template disenumpart2.txt
-
     CLASS_8_MEDICAL_MATERIAL (8, "Class 8 - Medical Material"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Class 9 - Repair Parts and Components */
-// autogenerated using string template disenumpart2.txt
-
     CLASS_9_REPAIR_PARTS_AND_COMPONENTS (9, "Class 9 - Repair Parts and Components"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Class 10 - Material to Support Non-Military Programs */
-// autogenerated using string template disenumpart2.txt
-
     CLASS_10_MATERIAL_TO_SUPPORT_NON_MILITARY_PROGRAMS (10, "Class 10 - Material to Support Non-Military Programs"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Class 11 - Supplies (Non Doctrinal) */
-// autogenerated using string template disenumpart2.txt
-
     CLASS_11_SUPPLIES_NON_DOCTRINAL (11, "Class 11 - Supplies (Non Doctrinal)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Class 12 - Sling Loads (Non Doctrinal) */
-// autogenerated using string template disenumpart2.txt
-
-    CLASS_12_SLING_LOADS_NON_DOCTRINAL (12, "Class 12 - Sling Loads (Non Doctrinal)"),;
-
-// autogenerated using string template disenumpart25.txt
+    CLASS_12_SLING_LOADS_NON_DOCTRINAL (12, "Class 12 - Sling Loads (Non Doctrinal)");
 
     private int value;
     private final String description;
@@ -146,8 +89,6 @@ public enum SupplyDomain
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SupplyFuelType.java b/src-generated/edu/nps/moves/dis7/enumerations/SupplyFuelType.java
index a57f5b0d2be2b47301fbb76a8a866cb6adddee4b..f46f0839133e8e9f54c516d671b4b96027880091 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SupplyFuelType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SupplyFuelType.java
@@ -7,85 +7,37 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1withfootnote.txt
-
 /**
- * Generated from XML,
- *  UID 413, marshal size 8,
- * SupplyFuelType
+ * Generated from XML, <br>
+ * UID 413 marshal size 8<br>
+ * SupplyFuelType<br>
  * Specific values for Supply Subcategory Fuels (1).
  */
 public enum SupplyFuelType 
 {
 
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Gasoline */
-// autogenerated using string template disenumpart2.txt
-
     GASOLINE (1, "Gasoline"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Diesel Fuel (F-54/DF-2) */
-// autogenerated using string template disenumpart2.txt
-
     DIESEL_FUEL_F_54_DF_2 (2, "Diesel Fuel (F-54/DF-2)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** JP-4 (F-40/JET B) */
-// autogenerated using string template disenumpart2.txt
-
     JP_4_F_40_JET_B (3, "JP-4 (F-40/JET B)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fuel Oil */
-// autogenerated using string template disenumpart2.txt
-
     FUEL_OIL (4, "Fuel Oil"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** JP-8 (F-34/JET A-1) */
-// autogenerated using string template disenumpart2.txt
-
     JP_8_F_34_JET_A_1 (5, "JP-8 (F-34/JET A-1)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Fog Oil */
-// autogenerated using string template disenumpart2.txt
-
     FOG_OIL (6, "Fog Oil"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Multi-Spectral Fog Oil */
-// autogenerated using string template disenumpart2.txt
-
     MULTI_SPECTRAL_FOG_OIL (7, "Multi-Spectral Fog Oil"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** JP-5 (F-44/JET A) */
-// autogenerated using string template disenumpart2.txt
-
     JP_5_F_44_JET_A (8, "JP-5 (F-44/JET A)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** JPTS */
-// autogenerated using string template disenumpart2.txt
-
     JPTS (9, "JPTS"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** TS-1 (Russia (RUS)) */
-// autogenerated using string template disenumpart2.txt
-
-    TS_1_RUSSIA_RUS (10, "TS-1 (Russia (RUS))"),;
-
-// autogenerated using string template disenumpart25.txt
+    TS_1_RUSSIA_RUS (10, "TS-1 (Russia (RUS))");
 
     private int value;
     private final String description;
@@ -135,8 +87,6 @@ public enum SupplyFuelType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SurveillanceStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/SurveillanceStatus.java
index 3a8f1773015eba56d0808a69db83e372c6c97e92..47e1fb28adcd1a862768ac30a226955b2617615d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SurveillanceStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SurveillanceStatus.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 365,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 365 marshal size 2<br>
  * SurveillanceStatus
  */
 public enum SurveillanceStatus 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Information */
-// autogenerated using string template disenumpart2.txt
-
     NO_INFORMATION (0, "No Information"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Emergency/Loss of Communications */
-// autogenerated using string template disenumpart2.txt
-
     EMERGENCY_LOSS_OF_COMMUNICATIONS (1, "Emergency/Loss of Communications"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SPI */
-// autogenerated using string template disenumpart2.txt
-
     SPI (2, "SPI"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** ATCRBS Code Change */
-// autogenerated using string template disenumpart2.txt
-
-    ATCRBS_CODE_CHANGE (3, "ATCRBS Code Change"),;
-
-// autogenerated using string template disenumpart25.txt
+    ATCRBS_CODE_CHANGE (3, "ATCRBS Code Change");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum SurveillanceStatus
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASBasicAdvancedIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASBasicAdvancedIndicator.java
index 16f3f52a0e276c1bfcb47940283fd0bc740701c8..7a5e2bc82a4c472ddb78d8a5fed0459a49224e60 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASBasicAdvancedIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASBasicAdvancedIndicator.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 341,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 341 marshal size 1<br>
  * TCASACASBasicAdvancedIndicator
  */
 public enum TCASACASBasicAdvancedIndicator 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Basic */
-// autogenerated using string template disenumpart2.txt
-
     BASIC (0, "Basic"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Advanced */
-// autogenerated using string template disenumpart2.txt
-
-    ADVANCED (1, "Advanced"),;
-
-// autogenerated using string template disenumpart25.txt
+    ADVANCED (1, "Advanced");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum TCASACASBasicAdvancedIndicator
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASIndicator.java
index 0e33c697ba76c1a3fedd4c25dd3026c135e7a1bd..777255be3e276a33cd4b01e27a2608c966b8ab8a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASIndicator.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 342,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 342 marshal size 1<br>
  * TCASACASIndicator
  */
 public enum TCASACASIndicator 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** TCAS */
-// autogenerated using string template disenumpart2.txt
-
     TCAS (0, "TCAS"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** ACAS */
-// autogenerated using string template disenumpart2.txt
-
-    ACAS (1, "ACAS"),;
-
-// autogenerated using string template disenumpart25.txt
+    ACAS (1, "ACAS");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum TCASACASIndicator
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASSoftwareVersion.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASSoftwareVersion.java
index 439098ce89ffe0cfd3037311b4f5eeab35ce3b45..e1ebd8ed8cedb3f9d27691fc122da19319dc8d59 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASSoftwareVersion.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASSoftwareVersion.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 343,
- * marshal size 3,
+ * Generated from XML, <br>
+ * UID 343 marshal size 3<br>
  * TCASACASSoftwareVersion
  */
 public enum TCASACASSoftwareVersion 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 6.0.2 */
-// autogenerated using string template disenumpart2.txt
-
     _602 (1, "6.0.2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 7.0 */
-// autogenerated using string template disenumpart2.txt
-
-    _70 (2, "7.0"),;
-
-// autogenerated using string template disenumpart25.txt
+    _70 (2, "7.0");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum TCASACASSoftwareVersion
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASType.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASType.java
index 6e7ffb7a7fd70169f68be53dd2c25a26daccec70..b3e72d53f15daf2a97c2d04dd1a30383022a63db 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASType.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 344,
- * marshal size 3,
+ * Generated from XML, <br>
+ * UID 344 marshal size 3<br>
  * TCASACASType
  */
 public enum TCASACASType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** ACAS I */
-// autogenerated using string template disenumpart2.txt
-
     ACAS_I (1, "ACAS I"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** ACAS II */
-// autogenerated using string template disenumpart2.txt
-
-    ACAS_II (2, "ACAS II"),;
-
-// autogenerated using string template disenumpart25.txt
+    ACAS_II (2, "ACAS II");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum TCASACASType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASIIIType.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASIIIType.java
index a3436e1a57a315fce693016ceb216d58c4e099c5..854d9ac5b13795339b242ec4bc9426443a615f15 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASIIIType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASIIIType.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 345,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 345 marshal size 1<br>
  * TCASIIIType
  */
 public enum TCASIIIType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** TCAS I (or No Statement) */
-// autogenerated using string template disenumpart2.txt
-
     TCAS_I_OR_NO_STATEMENT (0, "TCAS I (or No Statement)"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** TCAS II */
-// autogenerated using string template disenumpart2.txt
-
-    TCAS_II (1, "TCAS II"),;
-
-// autogenerated using string template disenumpart25.txt
+    TCAS_II (1, "TCAS II");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum TCASIIIType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TimeSlotAllocationLevel.java b/src-generated/edu/nps/moves/dis7/enumerations/TimeSlotAllocationLevel.java
index c911d78e0142671d2fa879e7bdc2660ad970ae9e..227b20cccf5fb0a36b47a63556554bb1925a432b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TimeSlotAllocationLevel.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TimeSlotAllocationLevel.java
@@ -7,48 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 172,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 172 marshal size 8<br>
  * TimeSlotAllocationLevel
  */
 public enum TimeSlotAllocationLevel 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Low Fidelity Level 0 */
-// autogenerated using string template disenumpart2.txt
-
     LOW_FIDELITY_LEVEL_0 (0, "Low Fidelity Level 0"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Low Fidelity Level 1 */
-// autogenerated using string template disenumpart2.txt
-
     LOW_FIDELITY_LEVEL_1 (1, "Low Fidelity Level 1"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium Fidelity Level 2 */
-// autogenerated using string template disenumpart2.txt
-
     MEDIUM_FIDELITY_LEVEL_2 (2, "Medium Fidelity Level 2"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Medium Fidelity Level 3 */
-// autogenerated using string template disenumpart2.txt
-
     MEDIUM_FIDELITY_LEVEL_3 (3, "Medium Fidelity Level 3"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** High Fidelity Level 4 */
-// autogenerated using string template disenumpart2.txt
-
-    HIGH_FIDELITY_LEVEL_4 (4, "High Fidelity Level 4"),;
-
-// autogenerated using string template disenumpart25.txt
+    HIGH_FIDELITY_LEVEL_4 (4, "High Fidelity Level 4");
 
     private int value;
     private final String description;
@@ -98,8 +73,6 @@ public enum TimeSlotAllocationLevel
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TimeTypeSource.java b/src-generated/edu/nps/moves/dis7/enumerations/TimeTypeSource.java
index 22176c075aa8233b0cd5892e1957fcc7172cac2d..cf8c4a9b8c6aaedf96d3d8ce5da98de8e03bd3a4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TimeTypeSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TimeTypeSource.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 367,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 367 marshal size 2<br>
  * TimeTypeSource
  */
 public enum TimeTypeSource 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Compute Locally */
-// autogenerated using string template disenumpart2.txt
-
     COMPUTE_LOCALLY (0, "Compute Locally"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Even Second */
-// autogenerated using string template disenumpart2.txt
-
     EVEN_SECOND (1, "Even Second"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Odd Second */
-// autogenerated using string template disenumpart2.txt
-
-    ODD_SECOND (2, "Odd Second"),;
-
-// autogenerated using string template disenumpart25.txt
+    ODD_SECOND (2, "Odd Second");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum TimeTypeSource
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransferControlTransferType.java b/src-generated/edu/nps/moves/dis7/enumerations/TransferControlTransferType.java
index 384e7831b0dc51a0c389656b30f8c81a2dd9ddc6..102a02934ed0f3e9d11de0c87e03004e3cef4e7f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransferControlTransferType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransferControlTransferType.java
@@ -7,84 +7,35 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 224,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 224 marshal size 8<br>
  * TransferControlTransferType
  */
 public enum TransferControlTransferType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Push Transfer - Entity */
-// autogenerated using string template disenumpart2.txt
-
     PUSH_TRANSFER_ENTITY (1, "Push Transfer - Entity"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Automatic Pull Transfer - Entity */
-// autogenerated using string template disenumpart2.txt
-
     AUTOMATIC_PULL_TRANSFER_ENTITY (2, "Automatic Pull Transfer - Entity"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Used */
-// autogenerated using string template disenumpart2.txt
-
     NOT_USED (3, "Not Used"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Push Transfer - Environmental Process */
-// autogenerated using string template disenumpart2.txt
-
     PUSH_TRANSFER_ENVIRONMENTAL_PROCESS (4, "Push Transfer - Environmental Process"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Automatic Pull Transfer - Environmental Process */
-// autogenerated using string template disenumpart2.txt
-
     AUTOMATIC_PULL_TRANSFER_ENVIRONMENTAL_PROCESS (5, "Automatic Pull Transfer - Environmental Process"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Not Used */
-// autogenerated using string template disenumpart2.txt
-
     NOT_USED_2 (6, "Not Used"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Cancel Transfer */
-// autogenerated using string template disenumpart2.txt
-
     CANCEL_TRANSFER (7, "Cancel Transfer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Manual Pull Transfer - Entity */
-// autogenerated using string template disenumpart2.txt
-
     MANUAL_PULL_TRANSFER_ENTITY (8, "Manual Pull Transfer - Entity"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Manual Pull Transfer - Environmental Process */
-// autogenerated using string template disenumpart2.txt
-
     MANUAL_PULL_TRANSFER_ENVIRONMENTAL_PROCESS (9, "Manual Pull Transfer - Environmental Process"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Remove Entity */
-// autogenerated using string template disenumpart2.txt
-
-    REMOVE_ENTITY (10, "Remove Entity"),;
-
-// autogenerated using string template disenumpart25.txt
+    REMOVE_ENTITY (10, "Remove Entity");
 
     private int value;
     private final String description;
@@ -134,8 +85,6 @@ public enum TransferControlTransferType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmissionIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmissionIndicator.java
index c0d3360765c5e04189000c2ffcbb3f40f8bffa3e..eb95b6743ce43e88b76a69562c2789168bf397c1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmissionIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmissionIndicator.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 372,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 372 marshal size 8<br>
  * TransmissionIndicator
  */
 public enum TransmissionIndicator 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** No Statement */
-// autogenerated using string template disenumpart2.txt
-
     NO_STATEMENT (0, "No Statement"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Original Interrogation */
-// autogenerated using string template disenumpart2.txt
-
     ORIGINAL_INTERROGATION (1, "Original Interrogation"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Interrogation Reply */
-// autogenerated using string template disenumpart2.txt
-
     INTERROGATION_REPLY (2, "Interrogation Reply"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Squitter Transmission */
-// autogenerated using string template disenumpart2.txt
-
-    SQUITTER_TRANSMISSION (3, "Squitter Transmission"),;
-
-// autogenerated using string template disenumpart25.txt
+    SQUITTER_TRANSMISSION (3, "Squitter Transmission");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum TransmissionIndicator
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternReferenceSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternReferenceSystem.java
index 02dd438f68871e0a446e017c2754a3446e3fbbd2..09d2c898d4cea4fd44c48fa88344ed9cfdbdf899 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternReferenceSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternReferenceSystem.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 168,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 168 marshal size 8<br>
  * TransmitterAntennaPatternReferenceSystem
  */
 public enum TransmitterAntennaPatternReferenceSystem 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** World Coordinates */
-// autogenerated using string template disenumpart2.txt
-
     WORLD_COORDINATES (1, "World Coordinates"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Entity Coordinates */
-// autogenerated using string template disenumpart2.txt
-
-    ENTITY_COORDINATES (2, "Entity Coordinates"),;
-
-// autogenerated using string template disenumpart25.txt
+    ENTITY_COORDINATES (2, "Entity Coordinates");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum TransmitterAntennaPatternReferenceSystem
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterInputSource.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterInputSource.java
index 34c866c7b326ad7e176daa0be6812ffd8db04fc7..9bd0f9ebe8e184950cd5328cf8d7ef3ed4adca64 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterInputSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterInputSource.java
@@ -7,108 +7,43 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 165,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 165 marshal size 8<br>
  * TransmitterInputSource
  */
 public enum TransmitterInputSource 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Pilot */
-// autogenerated using string template disenumpart2.txt
-
     PILOT (1, "Pilot"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Copilot */
-// autogenerated using string template disenumpart2.txt
-
     COPILOT (2, "Copilot"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** First Officer */
-// autogenerated using string template disenumpart2.txt
-
     FIRST_OFFICER (3, "First Officer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Driver */
-// autogenerated using string template disenumpart2.txt
-
     DRIVER (4, "Driver"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Loader */
-// autogenerated using string template disenumpart2.txt
-
     LOADER (5, "Loader"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Gunner */
-// autogenerated using string template disenumpart2.txt
-
     GUNNER (6, "Gunner"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Commander */
-// autogenerated using string template disenumpart2.txt
-
     COMMANDER (7, "Commander"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Digital Data Device */
-// autogenerated using string template disenumpart2.txt
-
     DIGITAL_DATA_DEVICE (8, "Digital Data Device"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Intercom */
-// autogenerated using string template disenumpart2.txt
-
     INTERCOM (9, "Intercom"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Audio Jammer */
-// autogenerated using string template disenumpart2.txt
-
     AUDIO_JAMMER (10, "Audio Jammer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Data Jammer */
-// autogenerated using string template disenumpart2.txt
-
     DATA_JAMMER (11, "Data Jammer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** GPS Jammer */
-// autogenerated using string template disenumpart2.txt
-
     GPS_JAMMER (12, "GPS Jammer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** GPS Meaconer */
-// autogenerated using string template disenumpart2.txt
-
     GPS_MEACONER (13, "GPS Meaconer"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** SATCOM Uplink Jammer */
-// autogenerated using string template disenumpart2.txt
-
-    SATCOM_UPLINK_JAMMER (14, "SATCOM Uplink Jammer"),;
-
-// autogenerated using string template disenumpart25.txt
+    SATCOM_UPLINK_JAMMER (14, "SATCOM Uplink Jammer");
 
     private int value;
     private final String description;
@@ -158,8 +93,6 @@ public enum TransmitterInputSource
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterTransmitState.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterTransmitState.java
index e5c28b5cb31da2ad49a44ad2497eb31752fdc2a1..141d72d0cc3b731d328027434ad01b0f656716da 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterTransmitState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterTransmitState.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 164,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 164 marshal size 8<br>
  * TransmitterTransmitState
  */
 public enum TransmitterTransmitState 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Off */
-// autogenerated using string template disenumpart2.txt
-
     OFF (0, "Off"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** On but not transmitting */
-// autogenerated using string template disenumpart2.txt
-
     ON_BUT_NOT_TRANSMITTING (1, "On but not transmitting"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** On and transmitting */
-// autogenerated using string template disenumpart2.txt
-
-    ON_AND_TRANSMITTING (2, "On and transmitting"),;
-
-// autogenerated using string template disenumpart25.txt
+    ON_AND_TRANSMITTING (2, "On and transmitting");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum TransmitterTransmitState
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransponderInterrogatorIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TransponderInterrogatorIndicator.java
index e5f67bd7e031e0ea44b66b05aaa32b81b2197bcb..54a79c1aa738a61ba6b051c7022b54148bce66a0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransponderInterrogatorIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransponderInterrogatorIndicator.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 337,
- * marshal size 1,
+ * Generated from XML, <br>
+ * UID 337 marshal size 1<br>
  * TransponderInterrogatorIndicator
  */
 public enum TransponderInterrogatorIndicator 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Transponder */
-// autogenerated using string template disenumpart2.txt
-
     TRANSPONDER (0, "Transponder"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Interrogator */
-// autogenerated using string template disenumpart2.txt
-
-    INTERROGATOR (1, "Interrogator"),;
-
-// autogenerated using string template disenumpart25.txt
+    INTERROGATOR (1, "Interrogator");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum TransponderInterrogatorIndicator
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TurnRateSource.java b/src-generated/edu/nps/moves/dis7/enumerations/TurnRateSource.java
index e66a68275bbb6f8b34b0e4979b3b2dea2b45019d..c6c45c965417787923bb6241eb3b07ad41fea9df 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TurnRateSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TurnRateSource.java
@@ -7,36 +7,19 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 366,
- * marshal size 2,
+ * Generated from XML, <br>
+ * UID 366 marshal size 2<br>
  * TurnRateSource
  */
 public enum TurnRateSource 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Compute Locally */
-// autogenerated using string template disenumpart2.txt
-
     COMPUTE_LOCALLY (0, "Compute Locally"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Less Than 1-Degree Turn or Not Turning */
-// autogenerated using string template disenumpart2.txt
-
     LESS_THAN_1_DEGREE_TURN_OR_NOT_TURNING (1, "Less Than 1-Degree Turn or Not Turning"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** 1-Degree or Greater Turn Rate */
-// autogenerated using string template disenumpart2.txt
-
-    _1_DEGREE_OR_GREATER_TURN_RATE (2, "1-Degree or Greater Turn Rate"),;
-
-// autogenerated using string template disenumpart25.txt
+    _1_DEGREE_OR_GREATER_TURN_RATE (2, "1-Degree or Greater Turn Rate");
 
     private int value;
     private final String description;
@@ -86,8 +69,6 @@ public enum TurnRateSource
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticEmitterSystemFunction.java b/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticEmitterSystemFunction.java
index f78e3fc6a4c705c559986bd3d4cf343057c9758d..33bbbb8e9cab8f3250bdf919aae1c8ee60e525db 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticEmitterSystemFunction.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticEmitterSystemFunction.java
@@ -7,48 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 145,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 145 marshal size 8<br>
  * UAAcousticEmitterSystemFunction
  */
 public enum UAAcousticEmitterSystemFunction 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Platform search/detect/track */
-// autogenerated using string template disenumpart2.txt
-
     PLATFORM_SEARCH_DETECT_TRACK (1, "Platform search/detect/track"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Navigation */
-// autogenerated using string template disenumpart2.txt
-
     NAVIGATION (2, "Navigation"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Mine hunting */
-// autogenerated using string template disenumpart2.txt
-
     MINE_HUNTING (3, "Mine hunting"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Weapon search/detect/track/detect */
-// autogenerated using string template disenumpart2.txt
-
-    WEAPON_SEARCH_DETECT_TRACK_DETECT (4, "Weapon search/detect/track/detect"),;
-
-// autogenerated using string template disenumpart25.txt
+    WEAPON_SEARCH_DETECT_TRACK_DETECT (4, "Weapon search/detect/track/detect");
 
     private int value;
     private final String description;
@@ -98,8 +73,6 @@ public enum UAAcousticEmitterSystemFunction
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfigurationConfiguration.java b/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfigurationConfiguration.java
index 267aa4fea41fa484e9f63a16deac1b82c9a48ada..6098064b17f718062dc7dd5ea717a84d72cd96ed 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfigurationConfiguration.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfigurationConfiguration.java
@@ -7,60 +7,27 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 335,
- * marshal size 7,
+ * Generated from XML, <br>
+ * UID 335 marshal size 7<br>
  * UAPropulsionPlantConfigurationConfiguration
  */
 public enum UAPropulsionPlantConfigurationConfiguration 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Other */
-// autogenerated using string template disenumpart2.txt
-
     OTHER (0, "Other"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Diesel/Electric */
-// autogenerated using string template disenumpart2.txt
-
     DIESEL_ELECTRIC (1, "Diesel/Electric"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Diesel */
-// autogenerated using string template disenumpart2.txt
-
     DIESEL (2, "Diesel"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Battery */
-// autogenerated using string template disenumpart2.txt
-
     BATTERY (3, "Battery"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Turbine Reduction */
-// autogenerated using string template disenumpart2.txt
-
     TURBINE_REDUCTION (4, "Turbine Reduction"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Steam */
-// autogenerated using string template disenumpart2.txt
-
     STEAM (6, "Steam"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Gas Turbine */
-// autogenerated using string template disenumpart2.txt
-
-    GAS_TURBINE (7, "Gas Turbine"),;
-
-// autogenerated using string template disenumpart25.txt
+    GAS_TURBINE (7, "Gas Turbine");
 
     private int value;
     private final String description;
@@ -110,8 +77,6 @@ public enum UAPropulsionPlantConfigurationConfiguration
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAStateChangeUpdateIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/UAStateChangeUpdateIndicator.java
index e45a9768b60f43b1ff55102c2184ada418a12d7f..cb433ba425109a87f2c4fca1d69f78cac4ce489b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAStateChangeUpdateIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAStateChangeUpdateIndicator.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 143,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 143 marshal size 8<br>
  * UAStateChangeUpdateIndicator
  */
 public enum UAStateChangeUpdateIndicator 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** State Update */
-// autogenerated using string template disenumpart2.txt
-
     STATE_UPDATE (0, "State Update"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Changed Data Update */
-// autogenerated using string template disenumpart2.txt
-
-    CHANGED_DATA_UPDATE (1, "Changed Data Update"),;
-
-// autogenerated using string template disenumpart25.txt
+    CHANGED_DATA_UPDATE (1, "Changed Data Update");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum UAStateChangeUpdateIndicator
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/VariableParameterRecordType.java b/src-generated/edu/nps/moves/dis7/enumerations/VariableParameterRecordType.java
index 7e0212886c6b73b13828562c847f833e5ff8d804..410d07f62f4964874b0f8481605f8a2b9578eb69 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/VariableParameterRecordType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariableParameterRecordType.java
@@ -7,48 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 56,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 56 marshal size 8<br>
  * VariableParameterRecordType
  */
 public enum VariableParameterRecordType 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Articulated Part */
-// autogenerated using string template disenumpart2.txt
-
     ARTICULATED_PART (0, "Articulated Part"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Attached Part */
-// autogenerated using string template disenumpart2.txt
-
     ATTACHED_PART (1, "Attached Part"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Separation */
-// autogenerated using string template disenumpart2.txt
-
     SEPARATION (2, "Separation"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Entity Type */
-// autogenerated using string template disenumpart2.txt
-
     ENTITY_TYPE (3, "Entity Type"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Entity Association */
-// autogenerated using string template disenumpart2.txt
-
-    ENTITY_ASSOCIATION (4, "Entity Association"),;
-
-// autogenerated using string template disenumpart25.txt
+    ENTITY_ASSOCIATION (4, "Entity Association");
 
     private int value;
     private final String description;
@@ -98,8 +73,6 @@ public enum VariableParameterRecordType
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforAirCategory200Bird.java b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforAirCategory200Bird.java
index 2de6b0bd14b73322e2bd3a31872edc2e34ed5d97..dc7db9ec8d6c5b64c1352e09a32e7e726159359d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforAirCategory200Bird.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforAirCategory200Bird.java
@@ -7,42 +7,21 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 136,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 136 marshal size 8<br>
  * VariantsforAirCategory200Bird
  */
 public enum VariantsforAirCategory200Bird 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Bird with Fish */
-// autogenerated using string template disenumpart2.txt
-
     BIRD_WITH_FISH (1, "Bird with Fish"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** V-Pattern Flock Shape */
-// autogenerated using string template disenumpart2.txt
-
     V_PATTERN_FLOCK_SHAPE (2, "V-Pattern Flock Shape"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Circular Flock Shape */
-// autogenerated using string template disenumpart2.txt
-
     CIRCULAR_FLOCK_SHAPE (3, "Circular Flock Shape"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Irregular Flock Shape */
-// autogenerated using string template disenumpart2.txt
-
-    IRREGULAR_FLOCK_SHAPE (4, "Irregular Flock Shape"),;
-
-// autogenerated using string template disenumpart25.txt
+    IRREGULAR_FLOCK_SHAPE (4, "Irregular Flock Shape");
 
     private int value;
     private final String description;
@@ -92,8 +71,6 @@ public enum VariantsforAirCategory200Bird
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java
index 02e71222d257fb3cc04ae007c46754e09a25a7d3..bc83acdc1e156f9db22f37038c42eb7d089b6ff5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java
@@ -7,48 +7,23 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 135,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 135 marshal size 8<br>
  * VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids
  */
 public enum VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Black */
-// autogenerated using string template disenumpart2.txt
-
     BLACK (1, "Black"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Green */
-// autogenerated using string template disenumpart2.txt
-
     GREEN (2, "Green"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Spotted */
-// autogenerated using string template disenumpart2.txt
-
     SPOTTED (3, "Spotted"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Red */
-// autogenerated using string template disenumpart2.txt
-
     RED (4, "Red"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Brown */
-// autogenerated using string template disenumpart2.txt
-
-    BROWN (5, "Brown"),;
-
-// autogenerated using string template disenumpart25.txt
+    BROWN (5, "Brown");
 
     private int value;
     private final String description;
@@ -98,8 +73,6 @@ public enum VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforSubsurfaceCategory201Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforSubsurfaceCategory201Mammal.java
index 66f54ff31b1892234d29c45d7aea7a7930a05971..8b095960203a16a456ad24016e96b3d5d47a27f3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforSubsurfaceCategory201Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforSubsurfaceCategory201Mammal.java
@@ -7,30 +7,17 @@ import java.io.IOException;
 
 import edu.nps.moves.dis7.pdus.*;
 
-// autogenerated using string template disenumpart1.txt
-
 /**
- * Generated from XML,
- *  UID 139,
- * marshal size 8,
+ * Generated from XML, <br>
+ * UID 139 marshal size 8<br>
  * VariantsforSubsurfaceCategory201Mammal
  */
 public enum VariantsforSubsurfaceCategory201Mammal 
 {
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Singing */
-// autogenerated using string template disenumpart2.txt
-
     SINGING (1, "Singing"),
-// autogenerated using string template disenumfootnotecomment.txt
-
     /** Spouting */
-// autogenerated using string template disenumpart2.txt
-
-    SPOUTING (2, "Spouting"),;
-
-// autogenerated using string template disenumpart25.txt
+    SPOUTING (2, "Spouting");
 
     private int value;
     private final String description;
@@ -80,8 +67,6 @@ public enum VariantsforSubsurfaceCategory201Mammal
        return null;
     }
 
-// autogenerated using string template disenumpart3_8.txt
-
     private boolean TRACE = false;
 
     /** Set tracing on/off for this object 
diff --git a/src-generated/edu/nps/moves/dis7/pdus/DisTime.java b/src-generated/edu/nps/moves/dis7/pdus/DisTime.java
index 84d9bd0733850dae4b5afa6526916b0fbf5cdf83..103bb788718fc490135743b4cbbb18343f6d3c14 100644
--- a/src-generated/edu/nps/moves/dis7/pdus/DisTime.java
+++ b/src-generated/edu/nps/moves/dis7/pdus/DisTime.java
@@ -63,8 +63,10 @@ public class DisTime
 {
     /** mask for absolute timestamps */
     public static final int ABSOLUTE_TIMESTAMP_MASK = 0x00000001;
+    
     /** mask for relative timestamps */
     public static final int RELATIVE_TIMESTAMP_MASK = 0xfffffffe;
+    
     /** calendar instance */
     protected GregorianCalendar calendar;
 
@@ -83,7 +85,8 @@ public class DisTime
 
         return disTime;
     }
-*/
+    */
+    
     public DisTime()
     {
         calendar = new GregorianCalendar();
@@ -95,6 +98,7 @@ public class DisTime
      * @return integer DIS time units since the start of the hour.
      */
     private int getDisTimeUnitsSinceTopOfHour() {
+        
         // set calendar object to current time
         long currentTime = System.currentTimeMillis(); // UTC milliseconds since 1970
         calendar.setTimeInMillis(currentTime);
@@ -191,6 +195,7 @@ public class DisTime
         t /= 1000l;   // NB: integer division, convert milliseconds to seconds
         return t;
     }
+    
     /**
      * Convert timestamp value to string for logging and diagnostics
      * @param timeStamp value in milliseconds
diff --git a/src/edu/nps/moves/dis7/examples/EspduSender.java b/src/edu/nps/moves/dis7/examples/EspduSender.java
index 4492cc7be4b7984f6cdda59e293ef07387625639..9cce76cbb75fc570c505890232f184821b406a16 100644
--- a/src/edu/nps/moves/dis7/examples/EspduSender.java
+++ b/src/edu/nps/moves/dis7/examples/EspduSender.java
@@ -8,6 +8,8 @@ package edu.nps.moves.dis7.examples;
 import edu.nps.moves.dis7.pdus.*;
 import edu.nps.moves.dis7.utilities.CoordinateConversions;
 import edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface;
+import edu.nps.moves.dis7.utilities.PduFactory;
+
 import java.io.*;
 import java.net.*;
 import java.util.*;
@@ -115,27 +117,14 @@ public class EspduSender
       System.exit(-1);
     }
     
-    EntityStatePdu espdu = new EntityStatePdu();
-    DisTime disTime = new DisTime();
+    // Factory with default absolute time
+    PduFactory pduFac = new PduFactory();
+    EntityStatePdu espdu = pduFac.makeEntityStatePdu();
 
     // ICBM coordinates for my office
     double lat = 36.595517;
     double lon = -121.877000;
 
-    // Initialize values in the Entity State PDU object. The exercise ID is 
-    // a way to differentiate between different virtual worlds on one network.
-    // Note that some values (such as the PDU type and PDU family) are set
-    // automatically when you create the ESPDU.
-    espdu.setExerciseID((byte) 1);
-
-    // The EID is the unique identifier for objects in the world. This 
-    // EID should match up with the ID for the object specified in the 
-    // VMRL/x3d/virtual world.
-    EntityID entityID = espdu.getEntityID();
-    entityID.setSiteID((short) 1);  // 0 is apparently not a valid site number, per the spec
-    entityID.setApplicationID((short) 1);
-    entityID.setEntityID((short) 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 
@@ -155,10 +144,23 @@ public class EspduSender
     // Using entitytype jar
     espdu.setEntityType(new edu.nps.moves.dis7.entities.usa.platform.land.M1A2());
 
-    Set<InetAddress> broadcastAddresses;
+    Set<InetAddress> broadcastAddresses = getBroadcastAddresses();
+    
     // Loop through sending N ESPDUs
     try {
       System.out.println("Sending " + NUMBER_TO_SEND + " ESPDU packets to " + destinationIp.toString());
+      int timestamp;
+      double direction;
+      double disCoordinates[];
+      Vector3Double location;
+      FirePdu fire;
+      byte[] fireArray;
+      byte[] data;
+      DatagramPacket packet;
+      
+      ByteArrayOutputStream baos = new ByteArrayOutputStream();
+      DataOutputStream dos = new DataOutputStream(baos);
+        
       for (int idx = 0; idx < NUMBER_TO_SEND; idx++) {
         // DIS time is a pain in the ass. DIS time units are 2^31-1 units per
         // hour, and time is set to DIS time units from the top of the hour. 
@@ -180,7 +182,7 @@ public class EspduSender
         // update the timestamp on ALL packets sent.
         // An alterative approach: actually follow the standard. It's a crazy concept,
         // but it might just work.
-        int timestamp = disTime.getDisAbsoluteTimestamp();
+        timestamp = pduFac.getTimestamp();
         espdu.setTimestamp(timestamp);
 
         // Set the position of the entity in the world. DIS uses a cartesian 
@@ -200,17 +202,17 @@ public class EspduSender
         // The x and y values will change, but the z value should not.
         //lon = lon + (double)((double)idx / 100000.0);
         //System.out.println("lla=" + lat + "," + lon + ", 0.0");
-        double direction = Math.pow(-1.0, idx);
+        direction = Math.pow(-1.0, idx);
         lon = lon + (direction * 0.00006);
-        System.out.println(lon);
+//        System.out.println(lon);
 
-        double disCoordinates[] = CoordinateConversions.getXYZfromLatLonDegrees(lat, lon, 1.0);
-        Vector3Double location = espdu.getEntityLocation();
+        disCoordinates = CoordinateConversions.getXYZfromLatLonDegrees(lat, lon, 1.0);
+        location = espdu.getEntityLocation();
         location.setX(disCoordinates[0]);
         location.setY(disCoordinates[1]);
         location.setZ(disCoordinates[2]);
-        System.out.println("lat, lon:" + lat + ", " + lon);
-        System.out.println("DIS coord:" + disCoordinates[0] + ", " + disCoordinates[1] + ", " + disCoordinates[2]);
+//        System.out.println("lat, lon: (" + lat + ", " + lon + ")");
+//        System.out.println("DIS coord: (" + disCoordinates[0] + ", " + disCoordinates[1] + ", " + disCoordinates[2] + ")");
 
         // Optionally, we can do some rotation of the entity
         /*
@@ -220,28 +222,25 @@ public class EspduSender
             orientation.setPsi(psi);
             orientation.setTheta((float)(orientation.getTheta() + idx /2.0));
          */
+        
         // You can set other ESPDU values here, such as the velocity, acceleration,
         // and so on.
         // Marshal out the espdu object to a byte array, then send a datagram
         // packet with that data in it.
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        DataOutputStream dos = new DataOutputStream(baos);
         espdu.marshal(dos);
 
-        FirePdu fire = new FirePdu();
-        byte[] fireArray = fire.marshal();
-
         // The byte array here is the packet in DIS format. We put that into a 
         // datagram and send it.
-        byte[] data = baos.toByteArray();
-        
-        broadcastAddresses = getBroadcastAddresses();
-        DatagramPacket packet;
+        data = baos.toByteArray();
         
+        fire = pduFac.makeFirePdu();
+        fireArray = fire.marshal();
+
         for (InetAddress broadcast : broadcastAddresses) {
-            System.out.println("Sending broadcast datagram packet to " + broadcast);
+            System.out.println("Sending broadcast datagram packets to " + broadcast);
             packet = new DatagramPacket(data, data.length, broadcast, port);
             socket.send(packet);
+            
             // TODO experiment with these!  8)
             packet = new DatagramPacket(fireArray, fireArray.length, broadcast, port); // alternate
             socket.send(packet);
@@ -250,13 +249,15 @@ public class EspduSender
         // Send every 1 sec. Otherwise this will be all over in a fraction of a second.
         Thread.sleep(1000L);
 
-        location = espdu.getEntityLocation();
+        baos.reset();
 
-        System.out.println("Espdu #" + idx + " EID=[" + entityID.getSiteID() + "," + entityID.getApplicationID() + "," + entityID.getEntityID() + "]");
-        System.out.println(" DIS coordinates location=[" + location.getX() + "," + location.getY() + "," + location.getZ() + "]");
+        System.out.println("Espdu #" + idx + " EID=[" + espdu.getEntityID().getSiteID() + ", " + espdu.getEntityID().getApplicationID() + ", " + espdu.getEntityID().getEntityID() + "]");
+        System.out.println(" DIS coordinates location=[" + location.getX() + ", " + location.getY() + ", " + location.getZ() + "]");
 //        double c[] = {location.getX(), location.getY(), location.getZ()};
 //        double lla[] = CoordinateConversions.xyzToLatLonDegrees(c);
 //      System.out.println(" Location (lat/lon/alt): [" + lla[0] + ", " + lla[1] + ", " + lla[2] + "]");
+
+        System.out.println("FirePdu #" + idx + " EID=[" + fire.getFiringEntityID().getSiteID() + ", " + fire.getFiringEntityID().getApplicationID() + ", " + fire.getFiringEntityID().getEntityID() + "]");
       }
     }
     catch (Exception ex) {
diff --git a/src/edu/nps/moves/dis7/utilities/PduFactory.java b/src/edu/nps/moves/dis7/utilities/PduFactory.java
index 7cd9c2f420f5a250f0ec76532225578c3058631d..4a8a780a457edc33d2dd1b2d09f99f43de4645e4 100644
--- a/src/edu/nps/moves/dis7/utilities/PduFactory.java
+++ b/src/edu/nps/moves/dis7/utilities/PduFactory.java
@@ -7,10 +7,12 @@ package edu.nps.moves.dis7.utilities;
 
 import edu.nps.moves.dis7.pdus.*;
 import edu.nps.moves.dis7.enumerations.*;
-import edu.nps.moves.dis7.enumerations.DisPduType;
+
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+
 import java.nio.ByteBuffer;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -39,7 +41,6 @@ public class PduFactory
   private byte defaultExerciseId = 1;
   private short defaultSiteId = 2;
   private short defaultAppId = 3;
-  private boolean useAbsoluteTimestamp = true;
   private final DisTime disTime;
 
   private Method getTime;
@@ -128,9 +129,12 @@ public class PduFactory
     useFastPdu = tf;
   }
 
-  /* ***************************************************/
- /* utility methods*/
-  private int doTime()
+  /** Retrieve the current timestamp in the time stamp style set at factory 
+   * instantiation.
+   * @return the current timestamp in the time stamp style set at factory 
+   * instantiation
+   */
+  public int getTimestamp()
   {
     try {
       return (int) getTime.invoke(disTime, (Object[]) null);
@@ -140,11 +144,13 @@ public class PduFactory
     }
   }
 
+  /* ***************************************************/
+ /* utility methods*/
   private PduBase addBoilerPlate(PduBase pdu)
   {
     pdu.getPduStatus().setValue((byte) (PduStatus.AII_ACTIVE | PduStatus.CEI_COUPLED));
     pdu.setExerciseID(defaultExerciseId)
-      .setTimestamp(doTime())
+      .setTimestamp(getTimestamp())
       .setLength((short) pdu.getMarshalledSize());  //todo check if should be done in Pdu class
 
     return pdu;
@@ -153,7 +159,7 @@ public class PduFactory
   private LiveEntityFamilyPdu addBoilerPlate(LiveEntityFamilyPdu pdu)
   {
     pdu.setExerciseID(defaultExerciseId)
-      .setTimestamp(doTime())
+      .setTimestamp(getTimestamp())
       .setLength((short) pdu.getMarshalledSize());  //todo check if should be done in Pdu class
 
     return pdu;
diff --git a/test/edu/nps/moves/dis7/MarshalEnumsTest.java b/test/edu/nps/moves/dis7/MarshalEnumsTest.java
index 79968ad625cd73ad581bd4b3137eaa3dc5f4e926..49a072a9a2dbd0f2920cfd1d22a7ab6b198c1405 100644
--- a/test/edu/nps/moves/dis7/MarshalEnumsTest.java
+++ b/test/edu/nps/moves/dis7/MarshalEnumsTest.java
@@ -6,8 +6,11 @@ package edu.nps.moves.dis7;
 
 import edu.nps.moves.dis7.enumerations.*;
 import edu.nps.moves.dis7.pdus.DisBitSet;
+
 import java.lang.reflect.Method;
+
 import java.nio.ByteBuffer;
+
 import org.junit.jupiter.api.*;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;