From ebe3d94c33d4542995732336585f312c69988773 Mon Sep 17 00:00:00 2001
From: Mike Bailey <jmbailey@nps.edu>
Date: Thu, 26 Sep 2019 10:57:56 -0700
Subject: [PATCH] New toString() methods

---
 src-generated/edu/nps/moves/dis7/APA.java     | 14 ++++-
 .../edu/nps/moves/dis7/AcknowledgePdu.java    | 15 +++++-
 .../edu/nps/moves/dis7/AcknowledgeRPdu.java   | 15 +++++-
 .../edu/nps/moves/dis7/AcousticEmitter.java   | 15 +++++-
 .../edu/nps/moves/dis7/ActionRequestPdu.java  | 18 ++++++-
 .../edu/nps/moves/dis7/ActionRequestRPdu.java | 21 +++++++-
 .../edu/nps/moves/dis7/ActionResponsePdu.java | 18 ++++++-
 .../nps/moves/dis7/ActionResponseRPdu.java    | 18 ++++++-
 .../nps/moves/dis7/AggregateIdentifier.java   | 14 ++++-
 .../edu/nps/moves/dis7/AggregateMarking.java  | 15 +++++-
 .../edu/nps/moves/dis7/AggregateStatePdu.java | 33 +++++++++++-
 .../edu/nps/moves/dis7/AggregateType.java     | 19 ++++++-
 .../edu/nps/moves/dis7/AngleDeception.java    | 28 +++++++++-
 .../nps/moves/dis7/AngularVelocityVector.java | 15 +++++-
 .../edu/nps/moves/dis7/AntennaLocation.java   | 14 ++++-
 .../edu/nps/moves/dis7/Appearance.java        | 16 +++++-
 .../edu/nps/moves/dis7/AppearancePdu.java     | 20 ++++++-
 .../nps/moves/dis7/ArealObjectStatePdu.java   | 25 ++++++++-
 .../edu/nps/moves/dis7/ArticulatedPartVP.java | 18 ++++++-
 .../nps/moves/dis7/ArticulatedPartsPdu.java   | 15 +++++-
 .../edu/nps/moves/dis7/Association.java       | 16 +++++-
 .../edu/nps/moves/dis7/AttachedPartVP.java    | 17 +++++-
 .../edu/nps/moves/dis7/Attribute.java         | 16 +++++-
 .../edu/nps/moves/dis7/AttributePdu.java      | 22 +++++++-
 .../nps/moves/dis7/AttributeRecordSet.java    | 15 +++++-
 .../nps/moves/dis7/BeamAntennaPattern.java    | 22 +++++++-
 .../edu/nps/moves/dis7/BeamData.java          | 17 +++++-
 .../edu/nps/moves/dis7/BeamStatus.java        | 13 ++++-
 .../edu/nps/moves/dis7/BlankingSector.java    | 25 ++++++++-
 .../edu/nps/moves/dis7/ChangeOptions.java     | 13 ++++-
 .../edu/nps/moves/dis7/ClockTime.java         | 14 ++++-
 .../nps/moves/dis7/CollisionElasticPdu.java   | 27 +++++++++-
 .../edu/nps/moves/dis7/CollisionPdu.java      | 20 ++++++-
 .../edu/nps/moves/dis7/CommentPdu.java        | 14 ++++-
 .../edu/nps/moves/dis7/CommentRPdu.java       | 14 ++++-
 .../nps/moves/dis7/CommunicationsNodeID.java  | 14 ++++-
 .../edu/nps/moves/dis7/CreateEntityPdu.java   | 13 ++++-
 .../edu/nps/moves/dis7/CreateEntityRPdu.java  | 16 +++++-
 .../edu/nps/moves/dis7/DataFilterRecord.java  | 24 ++++++++-
 src-generated/edu/nps/moves/dis7/DataPdu.java | 18 ++++++-
 .../dis7/DataQueryDatumSpecification.java     | 16 +++++-
 .../edu/nps/moves/dis7/DataQueryPdu.java      | 18 ++++++-
 .../edu/nps/moves/dis7/DataQueryRPdu.java     | 21 +++++++-
 .../edu/nps/moves/dis7/DataRPdu.java          | 20 ++++++-
 .../nps/moves/dis7/DatumSpecification.java    | 16 +++++-
 .../moves/dis7/DeadReckoningParameters.java   | 17 +++++-
 .../edu/nps/moves/dis7/DesignatorPdu.java     | 24 ++++++++-
 .../edu/nps/moves/dis7/DetonationPdu.java     | 24 ++++++++-
 .../dis7/DirectedEnergyAreaAimpoint.java      | 20 ++++++-
 .../nps/moves/dis7/DirectedEnergyDamage.java  | 25 ++++++++-
 .../nps/moves/dis7/DirectedEnergyFirePdu.java | 31 ++++++++++-
 .../dis7/DirectedEnergyPrecisionAimpoint.java | 27 +++++++++-
 .../DirectedEnergyTargetEnergyDeposition.java | 15 +++++-
 .../dis7/DistributedEmissionsFamilyPdu.java   | 12 ++++-
 src-generated/edu/nps/moves/dis7/Domain.java  | 37 ++++++++-----
 .../dis7/EEFundamentalParameterData.java      | 17 +++++-
 .../dis7/ElectromagneticEmissionPdu.java      | 18 ++++++-
 .../edu/nps/moves/dis7/ElectronicEmitter.java | 17 +++++-
 .../edu/nps/moves/dis7/EmitterBeam.java       | 23 +++++++-
 .../edu/nps/moves/dis7/EmitterSystem.java     | 15 +++++-
 .../edu/nps/moves/dis7/EngineFuel.java        | 17 +++++-
 .../edu/nps/moves/dis7/EngineFuelReload.java  | 20 ++++++-
 .../nps/moves/dis7/EntityAssociationVP.java   | 21 +++++++-
 .../nps/moves/dis7/EntityDamageStatusPdu.java | 17 +++++-
 .../edu/nps/moves/dis7/EntityID.java          | 15 +++++-
 .../edu/nps/moves/dis7/EntityIdentifier.java  | 14 ++++-
 .../dis7/EntityInformationFamilyPdu.java      | 12 ++++-
 .../moves/dis7/EntityManagementFamilyPdu.java | 12 ++++-
 .../edu/nps/moves/dis7/EntityMarking.java     | 15 +++++-
 .../edu/nps/moves/dis7/EntityStatePdu.java    | 25 ++++++++-
 .../nps/moves/dis7/EntityStateUpdatePdu.java  | 20 ++++++-
 .../edu/nps/moves/dis7/EntityType.java        | 20 ++++++-
 .../edu/nps/moves/dis7/EntityTypeRaw.java     | 19 ++++++-
 .../edu/nps/moves/dis7/EntityTypeVP.java      | 17 +++++-
 .../edu/nps/moves/dis7/Environment.java       | 19 ++++++-
 .../moves/dis7/EnvironmentalProcessPdu.java   | 20 ++++++-
 .../edu/nps/moves/dis7/EulerAngles.java       | 15 +++++-
 .../edu/nps/moves/dis7/EventIdentifier.java   | 14 ++++-
 .../moves/dis7/EventIdentifierLiveEntity.java | 15 +++++-
 .../edu/nps/moves/dis7/EventReportPdu.java    | 18 ++++++-
 .../edu/nps/moves/dis7/EventReportRPdu.java   | 18 ++++++-
 .../edu/nps/moves/dis7/Expendable.java        | 17 +++++-
 .../nps/moves/dis7/ExpendableDescriptor.java  | 14 ++++-
 .../edu/nps/moves/dis7/ExpendableReload.java  | 18 ++++++-
 .../nps/moves/dis7/ExplosionDescriptor.java   | 16 +++++-
 .../nps/moves/dis7/FalseTargetsAttribute.java | 27 +++++++++-
 .../nps/moves/dis7/FastEntityStatePdu.java    | 54 ++++++++++++++++++-
 src-generated/edu/nps/moves/dis7/FirePdu.java | 21 +++++++-
 .../edu/nps/moves/dis7/FixedDatum.java        | 14 ++++-
 .../dis7/FundamentalOperationalData.java      | 22 +++++++-
 .../nps/moves/dis7/GridAxisDescriptor.java    | 17 +++++-
 .../moves/dis7/GridAxisDescriptorFixed.java   | 14 ++++-
 .../dis7/GridAxisDescriptorVariable.java      | 19 ++++++-
 .../edu/nps/moves/dis7/GridData.java          | 14 ++++-
 .../edu/nps/moves/dis7/GridDataType0.java     | 15 +++++-
 .../edu/nps/moves/dis7/GridDataType1.java     | 17 +++++-
 .../edu/nps/moves/dis7/GridDataType2.java     | 15 +++++-
 .../edu/nps/moves/dis7/GriddedDataPdu.java    | 29 +++++++++-
 src-generated/edu/nps/moves/dis7/GroupID.java | 14 ++++-
 src-generated/edu/nps/moves/dis7/IFFData.java | 17 +++++-
 .../dis7/IFFFundamentalParameterData.java     | 20 ++++++-
 .../edu/nps/moves/dis7/IFFLayer2Pdu.java      | 18 ++++++-
 src-generated/edu/nps/moves/dis7/IFFPdu.java  | 19 ++++++-
 .../edu/nps/moves/dis7/IOCommsNodeRecord.java | 17 +++++-
 .../edu/nps/moves/dis7/IOEffectRecord.java    | 21 +++++++-
 .../edu/nps/moves/dis7/IORecord.java          | 12 ++++-
 .../nps/moves/dis7/IffDataSpecification.java  | 14 ++++-
 .../dis7/InformationOperationsActionPdu.java  | 24 ++++++++-
 .../dis7/InformationOperationsFamilyPdu.java  | 13 ++++-
 .../dis7/InformationOperationsReportPdu.java  | 21 +++++++-
 .../IntercomCommunicationsParameters.java     | 17 +++++-
 .../nps/moves/dis7/IntercomControlPdu.java    | 25 ++++++++-
 .../nps/moves/dis7/IntercomIdentifier.java    | 16 +++++-
 .../nps/moves/dis7/IntercomReferenceID.java   | 15 +++++-
 .../edu/nps/moves/dis7/IsGroupOfPdu.java      | 19 ++++++-
 .../edu/nps/moves/dis7/IsPartOfPdu.java       | 18 ++++++-
 .../edu/nps/moves/dis7/JammingTechnique.java  | 16 +++++-
 .../edu/nps/moves/dis7/LEDetonationPdu.java   | 24 ++++++++-
 .../edu/nps/moves/dis7/LEFirePdu.java         | 21 +++++++-
 .../nps/moves/dis7/LEVector3FixedByte.java    | 15 +++++-
 .../moves/dis7/LaunchedMunitionRecord.java    | 19 ++++++-
 .../edu/nps/moves/dis7/LayerHeader.java       | 15 +++++-
 .../nps/moves/dis7/LinearObjectStatePdu.java  | 21 +++++++-
 .../moves/dis7/LinearSegmentParameter.java    | 25 ++++++++-
 .../dis7/LiveDeadReckoningParameters.java     | 15 +++++-
 .../nps/moves/dis7/LiveEntityFamilyPdu.java   | 12 ++++-
 .../nps/moves/dis7/LiveEntityIdentifier.java  | 14 ++++-
 .../moves/dis7/LiveEntityLinearVelocity.java  | 15 +++++-
 .../nps/moves/dis7/LiveEntityOrientation.java | 15 +++++-
 .../moves/dis7/LiveEntityOrientation16.java   | 15 +++++-
 .../dis7/LiveEntityOrientationError.java      | 15 +++++-
 .../edu/nps/moves/dis7/LiveEntityPdu.java     | 14 ++++-
 .../moves/dis7/LiveEntityPositionError.java   | 14 ++++-
 .../LiveEntityRelativeWorldCoordinates.java   | 16 +++++-
 .../nps/moves/dis7/LiveSimulationAddress.java | 14 ++++-
 .../nps/moves/dis7/LogisticsFamilyPdu.java    | 12 ++++-
 .../nps/moves/dis7/MineEmplacementTime.java   | 14 ++++-
 .../nps/moves/dis7/MineEntityIdentifier.java  | 14 ++++-
 .../edu/nps/moves/dis7/MinefieldDataPdu.java  | 54 ++++++++++++++++++-
 .../nps/moves/dis7/MinefieldFamilyPdu.java    | 12 ++++-
 .../nps/moves/dis7/MinefieldIdentifier.java   | 14 ++++-
 .../edu/nps/moves/dis7/MinefieldQueryPdu.java | 22 +++++++-
 .../moves/dis7/MinefieldResponseNACKPdu.java  | 17 +++++-
 .../nps/moves/dis7/MinefieldSensorType.java   | 13 ++++-
 .../edu/nps/moves/dis7/MinefieldStatePdu.java | 25 ++++++++-
 .../nps/moves/dis7/ModulationParameters.java  | 15 +++++-
 .../edu/nps/moves/dis7/ModulationType.java    | 16 +++++-
 .../edu/nps/moves/dis7/Munition.java          | 17 +++++-
 .../nps/moves/dis7/MunitionDescriptor.java    | 17 +++++-
 .../edu/nps/moves/dis7/MunitionReload.java    | 18 ++++++-
 .../dis7/NamedLocationIdentification.java     | 14 ++++-
 .../edu/nps/moves/dis7/ObjectIdentifier.java  | 14 ++++-
 .../edu/nps/moves/dis7/ObjectType.java        | 16 +++++-
 .../nps/moves/dis7/OwnershipStatusRecord.java | 15 +++++-
 src-generated/edu/nps/moves/dis7/Pdu.java     | 18 ++++++-
 src-generated/edu/nps/moves/dis7/PduBase.java | 14 ++++-
 .../edu/nps/moves/dis7/PduStatus.java         |  6 +++
 .../nps/moves/dis7/PointObjectStatePdu.java   | 28 +++++++++-
 .../nps/moves/dis7/PropulsionSystemData.java  | 14 ++++-
 .../edu/nps/moves/dis7/ProtocolMode.java      | 13 ++++-
 .../edu/nps/moves/dis7/RadioCommsHeader.java  | 14 ++++-
 .../dis7/RadioCommunicationsFamilyPdu.java    | 12 ++++-
 .../edu/nps/moves/dis7/RadioIdentifier.java   | 16 +++++-
 .../edu/nps/moves/dis7/RadioType.java         | 19 ++++++-
 .../edu/nps/moves/dis7/ReceiverPdu.java       | 18 ++++++-
 .../edu/nps/moves/dis7/RecordQueryRPdu.java   | 19 ++++++-
 .../moves/dis7/RecordQuerySpecification.java  | 14 ++++-
 .../edu/nps/moves/dis7/RecordRPdu.java        | 18 ++++++-
 .../nps/moves/dis7/RecordSpecification.java   | 14 ++++-
 .../dis7/RecordSpecificationElement.java      | 21 +++++++-
 .../edu/nps/moves/dis7/Relationship.java      | 14 ++++-
 .../edu/nps/moves/dis7/RemoveEntityPdu.java   | 13 ++++-
 .../edu/nps/moves/dis7/RemoveEntityRPdu.java  | 16 +++++-
 .../edu/nps/moves/dis7/RepairCompletePdu.java | 16 +++++-
 .../edu/nps/moves/dis7/RepairResponsePdu.java | 17 +++++-
 .../edu/nps/moves/dis7/RequestID.java         | 13 ++++-
 .../edu/nps/moves/dis7/ResupplyCancelPdu.java | 14 ++++-
 .../edu/nps/moves/dis7/ResupplyOfferPdu.java  | 18 ++++++-
 .../nps/moves/dis7/ResupplyReceivedPdu.java   | 18 ++++++-
 src-generated/edu/nps/moves/dis7/SEESPdu.java | 20 ++++++-
 .../moves/dis7/SecondaryOperationalData.java  | 15 +++++-
 src-generated/edu/nps/moves/dis7/Sensor.java  | 18 ++++++-
 .../edu/nps/moves/dis7/SeparationVP.java      | 19 ++++++-
 .../edu/nps/moves/dis7/ServiceRequestPdu.java | 18 ++++++-
 .../edu/nps/moves/dis7/SetDataPdu.java        | 18 ++++++-
 .../edu/nps/moves/dis7/SetDataRPdu.java       | 20 ++++++-
 .../edu/nps/moves/dis7/SetRecordRPdu.java     | 19 ++++++-
 .../edu/nps/moves/dis7/ShaftRPM.java          | 15 +++++-
 .../nps/moves/dis7/SilentEntitySystem.java    | 16 +++++-
 .../edu/nps/moves/dis7/SimulationAddress.java | 14 ++++-
 .../nps/moves/dis7/SimulationIdentifier.java  | 14 ++++-
 .../dis7/SimulationManagementFamilyPdu.java   | 14 ++++-
 ...ionManagementWithReliabilityFamilyPdu.java | 14 ++++-
 .../moves/dis7/StandardVariableRecord.java    | 16 +++++-
 .../dis7/StandardVariableSpecification.java   | 15 +++++-
 .../edu/nps/moves/dis7/StartResumePdu.java    | 15 +++++-
 .../edu/nps/moves/dis7/StartResumeRPdu.java   | 18 ++++++-
 .../edu/nps/moves/dis7/StopFreezePdu.java     | 18 ++++++-
 .../edu/nps/moves/dis7/StopFreezeRPdu.java    | 19 ++++++-
 .../edu/nps/moves/dis7/StorageFuel.java       | 17 +++++-
 .../edu/nps/moves/dis7/StorageFuelReload.java | 20 ++++++-
 .../edu/nps/moves/dis7/SupplyQuantity.java    | 14 ++++-
 .../dis7/SyntheticEnvironmentFamilyPdu.java   | 12 ++++-
 .../edu/nps/moves/dis7/SystemIdentifier.java  | 16 +++++-
 src-generated/edu/nps/moves/dis7/TSPIPdu.java | 23 +++++++-
 .../edu/nps/moves/dis7/TotalRecordSets.java   | 14 ++++-
 .../edu/nps/moves/dis7/TrackJamData.java      | 15 +++++-
 .../nps/moves/dis7/TransferOwnershipPdu.java  | 19 ++++++-
 .../edu/nps/moves/dis7/TransmitterPdu.java    | 33 +++++++++++-
 src-generated/edu/nps/moves/dis7/UABeam.java  | 16 +++++-
 .../edu/nps/moves/dis7/UAEmitter.java         | 18 ++++++-
 .../moves/dis7/UAFundamentalParameter.java    | 18 ++++++-
 .../nps/moves/dis7/UnattachedIdentifier.java  | 14 ++++-
 .../nps/moves/dis7/UnderwaterAcousticPdu.java | 24 ++++++++-
 .../nps/moves/dis7/UnsignedDISInteger.java    | 13 ++++-
 .../edu/nps/moves/dis7/VariableDatum.java     | 26 +++++++--
 .../edu/nps/moves/dis7/VariableParameter.java | 15 +++++-
 .../dis7/VariableTransmitterParameters.java   | 17 +++++-
 .../edu/nps/moves/dis7/Vector2Float.java      | 14 ++++-
 .../edu/nps/moves/dis7/Vector3Double.java     | 15 +++++-
 .../edu/nps/moves/dis7/Vector3Float.java      | 15 +++++-
 .../nps/moves/dis7/VectoringNozzleSystem.java | 14 ++++-
 .../edu/nps/moves/dis7/WarfareFamilyPdu.java  | 12 ++++-
 .../APAParameterIndexAPAStatus.java           |  6 +++
 .../AcknowledgeAcknowledgeFlag.java           |  6 +++
 .../enumerations/AcknowledgeResponseFlag.java |  6 +++
 .../nps/moves/dis7/enumerations/Acronyms.java |  6 +++
 .../enumerations/ActionRequestActionID.java   |  6 +++
 .../ActionResponseRequestStatus.java          |  6 +++
 ...sionEnumerationsforSubsurfaceAreaSize.java |  6 +++
 .../AddVariantsforAirCategory201Insect.java   |  6 +++
 .../AddVariantsforLandCategory200Mammal.java  |  6 +++
 ...egoriesFishMolluskCrustaceanandInsect.java |  6 +++
 .../AggregateStateAggregateKind.java          |  6 +++
 .../AggregateStateAggregateState.java         |  6 +++
 .../enumerations/AggregateStateFormation.java |  6 +++
 .../enumerations/AggregateStateSpecific.java  |  6 +++
 .../AggregateStateSubcategory.java            |  6 +++
 .../enumerations/AirPlatformAppearance.java   |  6 +++
 .../enumerations/AirPlatformCapabilities.java |  6 +++
 .../enumerations/AircraftAddressSource.java   |  6 +++
 .../AircraftIdentificationType.java           |  6 +++
 .../enumerations/AircraftPresentDomain.java   |  6 +++
 .../dis7/enumerations/AircraftTypeWake.java   |  6 +++
 ...roupSizeRangeEnumerationforallDomains.java |  6 +++
 .../dis7/enumerations/AntennaSelection.java   |  6 +++
 .../dis7/enumerations/AntennaStatus.java      |  6 +++
 .../AppearanceAntiCollisionDayNight.java      |  6 +++
 .../AppearanceCamouflageType.java             |  6 +++
 .../dis7/enumerations/AppearanceCanopy.java   |  6 +++
 .../AppearanceConcealedMovement.java          |  6 +++
 .../AppearanceConcealedPosition.java          |  6 +++
 .../dis7/enumerations/AppearanceDamage.java   |  6 +++
 .../AppearanceEntityorObjectState.java        |  6 +++
 .../AppearanceEnvironmentalDensity.java       |  6 +++
 .../dis7/enumerations/AppearanceHatch.java    |  6 +++
 .../AppearanceLauncherOperational.java        |  6 +++
 .../AppearanceLifeFormComplianceStatus.java   |  6 +++
 .../AppearanceLifeFormPosture.java            |  6 +++
 .../AppearanceLifeFormWeaponImplement.java    |  6 +++
 .../AppearanceLifeformHealth.java             |  6 +++
 ...pearanceLinearObjectLaneMarkerVisible.java |  6 +++
 ...AppearanceLinearObjectTankDitchBreach.java |  6 +++
 .../dis7/enumerations/AppearanceNVGMode.java  |  6 +++
 ...ppearanceNavigationPositionBrightness.java |  6 +++
 .../AppearanceObjectGeneralDamage.java        |  6 +++
 .../AppearanceObjectGeneralIEDPresent.java    |  6 +++
 ...AppearanceObjectGeneralPredistributed.java |  6 +++
 .../AppearanceObjectSpecificBreachState.java  |  6 +++
 .../AppearanceObjectSpecificChemicalType.java |  6 +++
 .../enumerations/AppearancePaintScheme.java   |  6 +++
 .../AppearanceSubsurfaceHatch.java            |  6 +++
 .../AppearanceSupplyDeployed.java             |  6 +++
 .../AppearanceTrailingEffects.java            |  6 +++
 .../ArealObjectAppearanceMinefield.java       |  6 +++
 .../ArticulatedPartsTypeClass.java            |  6 +++
 .../ArticulatedPartsTypeMetric.java           |  6 +++
 .../AttachedPartDetachedIndicator.java        |  6 +++
 .../dis7/enumerations/AttachedParts.java      |  6 +++
 .../AustralianCategoryOverlay.java            |  6 +++
 .../enumerations/BeamStatusBeamState.java     |  6 +++
 .../enumerations/BuildingPaintScheme.java     |  6 +++
 .../CCTTSINCGARSClearChannel.java             |  6 +++
 .../CCTTSINCGARSStartofMessage.java           |  6 +++
 .../enumerations/CIGIExtensionPacketID.java   |  6 +++
 .../dis7/enumerations/CapabilityReport.java   |  6 +++
 ...yMaterialtoSupportNonMilitaryPrograms.java |  6 +++
 ...s11SupplyCategorySuppliesNonDoctrinal.java |  6 +++
 ...2SupplyCategorySlingLoadsNonDoctrinal.java |  6 +++
 .../Class1SupplyCategorySubsistence.java      |  6 +++
 ...IndividualEquipmentToolsAdminSupplies.java |  6 +++
 ...SupplyCategoryPetroleumOilsLubricants.java |  6 +++
 ...s4SupplyCategoryConstructionMaterials.java |  6 +++
 ...ss6SupplyCategoryPersonnelDemandItems.java |  6 +++
 .../Class7SupplyCategoryMajorItems.java       |  6 +++
 .../Class8SupplyCategoryMedicalMaterial.java  |  6 +++
 ...upplyCategoryRepairPartsandComponents.java |  6 +++
 .../dis7/enumerations/CollisionType.java      |  6 +++
 .../nps/moves/dis7/enumerations/Color.java    |  6 +++
 .../ComponentVisualDamageStatusSmoke.java     |  6 +++
 ...ponentVisualDamageStatusSurfaceDamage.java |  6 +++
 .../nps/moves/dis7/enumerations/Country.java  |  6 +++
 .../dis7/enumerations/CoverShroudStatus.java  |  6 +++
 .../enumerations/CryptoKeyIDCryptoMode.java   |  6 +++
 .../CulturalFeatureAppearance.java            |  6 +++
 .../CulturalFeatureCapabilities.java          |  6 +++
 ...amageDescriptionComponentDamageStatus.java |  6 +++
 ...escriptionComponentVisualDamageStatus.java |  6 +++
 ...eDescriptionComponentVisualSmokeColor.java |  6 +++
 .../moves/dis7/enumerations/DEFireFlags.java  |  6 +++
 .../DEFireFlagsStateUpdateFlag.java           |  6 +++
 .../dis7/enumerations/DEFirePulseShape.java   |  6 +++
 .../DEPrecisionAimpointBeamSpotType.java      |  6 +++
 .../enumerations/DISAttributeActionCode.java  |  6 +++
 .../DISLiveEntitySubprotocolNumber.java       |  6 +++
 ...StatusActiveInterrogationIndicatorAII.java |  6 +++
 ...PDUStatusCoupledExtensionIndicatorCEI.java |  6 +++
 ...ISPDUStatusDetonationTypeIndicatorDTI.java |  6 +++
 .../DISPDUStatusFireTypeIndicatorFTI.java     |  6 +++
 .../DISPDUStatusIFFSimulationModeISM.java     |  6 +++
 ...PDUStatusIntercomAttachedIndicatorIAI.java |  6 +++
 .../DISPDUStatusLVCIndicatorLVC.java          |  6 +++
 ...DISPDUStatusRadioAttachedIndicatorRAI.java |  6 +++
 ...DUStatusTransferredEntityIndicatorTEI.java |  6 +++
 .../moves/dis7/enumerations/DISPDUType.java   |  6 +++
 .../dis7/enumerations/DISProtocolFamily.java  |  6 +++
 .../dis7/enumerations/DISProtocolVersion.java |  6 +++
 .../dis7/enumerations/DRParametersType.java   |  6 +++
 .../moves/dis7/enumerations/DataCategory.java |  6 +++
 .../enumerations/DeadReckoningAlgorithm.java  |  6 +++
 ...de5SAltitudePositiveNegativeIndicator.java |  6 +++
 .../DesignatorDesignatorCode.java             |  6 +++
 .../enumerations/DesignatorSystemName.java    |  6 +++
 .../dis7/enumerations/DetonationResult.java   |  6 +++
 .../EEAttributeStateIndicator.java            |  6 +++
 .../ElectromagneticEmissionBeamFunction.java  |  6 +++
 ...omagneticEmissionStateUpdateIndicator.java |  6 +++
 .../moves/dis7/enumerations/EmitterName.java  |  6 +++
 .../enumerations/EmitterSystemFunction.java   |  6 +++
 .../EntityAssociationAssociationStatus.java   |  6 +++
 .../EntityAssociationAssociationType.java     |  6 +++
 .../EntityAssociationGroupMemberType.java     |  6 +++
 ...ityAssociationPhysicalAssociationType.java |  6 +++
 ...tityAssociationPhysicalConnectionType.java |  6 +++
 .../enumerations/EntityCapabilityTypes.java   |  6 +++
 ...tyDamageStatusComponentIdentification.java |  6 +++
 .../moves/dis7/enumerations/EntityKind.java   |  6 +++
 .../EntityMarkingCharacterSet.java            |  6 +++
 .../EntityVPRecordChangeIndicator.java        |  6 +++
 .../EnvironmentRecordTypeGroups.java          |  6 +++
 .../enumerations/EnvironmentalAppearance.java |  6 +++
 .../EnvironmentalCapabilities.java            |  6 +++
 ...EnvironmentalProcessEnvironmentStatus.java |  6 +++
 .../EnvironmentalProcessModelType.java        |  6 +++
 .../EnvironmentalProcessRecordType.java       |  6 +++
 .../EnvironmentalSubcategory.java             |  6 +++
 .../enumerations/EventReportEventType.java    |  6 +++
 .../enumerations/ExpendableAirCategory.java   |  6 +++
 .../enumerations/ExpendableAppearance.java    |  6 +++
 .../enumerations/ExpendableCapabilities.java  |  6 +++
 .../ExpendableSubsurfaceCategory.java         |  6 +++
 .../ExpendableSurfaceCategory.java            |  6 +++
 .../ExplosiveMaterialCategories.java          |  6 +++
 .../enumerations/ExplosiveMaterialGroups.java |  6 +++
 .../dis7/enumerations/FlareSmokeColor.java    |  6 +++
 .../dis7/enumerations/FlareSmokeStatus.java   |  6 +++
 .../nps/moves/dis7/enumerations/ForceID.java  |  6 +++
 .../moves/dis7/enumerations/FormatType.java   |  6 +++
 .../moves/dis7/enumerations/FuelLocation.java |  6 +++
 .../enumerations/FuelMeasurementUnits.java    |  6 +++
 .../GridAxisDescriptorAxisType.java           |  6 +++
 .../enumerations/GriddedDataConstantGrid.java |  6 +++
 .../GriddedDataCoordinateSystem.java          |  6 +++
 .../GriddedDataDataRepresentation.java        |  6 +++
 .../enumerations/GriddedDataFieldNumber.java  |  6 +++
 .../enumerations/GriddedDataSampleType.java   |  6 +++
 .../enumerations/HighDensityTrackJam.java     |  6 +++
 ...FidelityHAVEQUICKTODTransmitIndicator.java |  6 +++
 .../IFFAlternateMode4ChallengeReply.java      |  6 +++
 .../dis7/enumerations/IFFApplicableModes.java |  6 +++
 .../enumerations/IFFDataRecordAvailable.java  |  6 +++
 .../IFFLayerSpecificInformation.java          |  6 +++
 .../dis7/enumerations/IFFSimulationMode.java  |  6 +++
 .../dis7/enumerations/IFFSystemMode.java      |  6 +++
 .../dis7/enumerations/IFFSystemName.java      |  6 +++
 .../dis7/enumerations/IFFSystemType.java      |  6 +++
 .../IFFSystemType1OperationalParameter1.java  |  6 +++
 .../IFFSystemType1OperationalParameter2.java  |  6 +++
 .../enumerations/IOActionIOActionPhase.java   |  6 +++
 .../enumerations/IOActionIOActionType.java    |  6 +++
 .../IOActionIOSimulationSource.java           |  6 +++
 .../enumerations/IOActionIOWarfareType.java   |  6 +++
 .../IOCommsNodeRecordCommsNodeType.java       |  6 +++
 .../enumerations/IOEffectsRecordIOEffect.java |  6 +++
 .../IOEffectsRecordIOLinkType.java            |  6 +++
 .../IOEffectsRecordIOProcess.java             |  6 +++
 .../enumerations/IOEffectsRecordIOStatus.java |  6 +++
 .../enumerations/IOReportIOReportType.java    |  6 +++
 .../dis7/enumerations/ISLSAntennaType.java    |  6 +++
 .../enumerations/IntercomControlCommand.java  |  6 +++
 .../IntercomControlCommunicationsClass.java   |  6 +++
 .../IntercomControlCommunicationsType.java    |  6 +++
 .../IntercomControlControlType.java           |  6 +++
 ...comControlDestinationLineStateCommand.java |  6 +++
 .../IntercomControlRecordType.java            |  6 +++
 .../IntercomControlTransmitLineState.java     |  6 +++
 .../IsGroupOfGroupedEntityCategory.java       |  6 +++
 .../enumerations/IsGroupOfRestStatus.java     |  6 +++
 .../dis7/enumerations/IsPartOfNature.java     |  6 +++
 .../dis7/enumerations/IsPartOfPosition.java   |  6 +++
 .../enumerations/IsPartOfStationName.java     |  6 +++
 .../dis7/enumerations/IslandSubcategory.java  |  6 +++
 ...ulationParametersSynchronizationState.java |  6 +++
 ...metersTransmittingTerminalPrimaryMode.java |  6 +++
 ...tersTransmittingTerminalSecondaryMode.java |  6 +++
 .../enumerations/LandPlatformAppearance.java  |  6 +++
 .../LandPlatformCapabilities.java             |  6 +++
 .../moves/dis7/enumerations/LeafCoverage.java |  6 +++
 .../enumerations/Level2SquitterStatus.java    |  6 +++
 .../enumerations/LifeFormAirCategories.java   |  6 +++
 .../enumerations/LifeFormCategoriesUS.java    |  6 +++
 .../LifeFormExtraPersonalData.java            |  6 +++
 ...feFormHumanSpecificAntiMaterielRifles.java |  6 +++
 ...LifeFormHumanSpecificAntiTankMissiles.java |  6 +++
 .../LifeFormHumanSpecificAntiTankRockets.java |  6 +++
 .../LifeFormHumanSpecificAssaultRifles.java   |  6 +++
 .../LifeFormHumanSpecificDroneGuns.java       |  6 +++
 .../LifeFormHumanSpecificEquipmentClass.java  |  6 +++
 .../LifeFormHumanSpecificFlameRockets.java    |  6 +++
 .../LifeFormHumanSpecificFlameThrowers.java   |  6 +++
 ...LifeFormHumanSpecificGrenadeLaunchers.java |  6 +++
 ...manSpecificGrenadeLaunchingMachineGun.java |  6 +++
 .../LifeFormHumanSpecificHandGuns.java        |  6 +++
 .../LifeFormHumanSpecificHighPowerRifles.java |  6 +++
 .../LifeFormHumanSpecificMachineGuns.java     |  6 +++
 ...anSpecificManPortableAirDefenseSystem.java |  6 +++
 .../LifeFormHumanSpecificMortars.java         |  6 +++
 ...LifeFormHumanSpecificRecoillessRifles.java |  6 +++
 .../LifeFormHumanSpecificShotGuns.java        |  6 +++
 .../LifeFormHumanSpecificSniper.java          |  6 +++
 .../LifeFormHumanSpecificSubMachineGun.java   |  6 +++
 ...ifeFormHumanSpecificWeaponNonspecific.java |  6 +++
 ...ifeFormHumanSubcategoryEquipmentClass.java |  6 +++
 .../enumerations/LifeFormLandCategories.java  |  6 +++
 .../LifeFormSubsurfaceCategories.java         |  6 +++
 .../enumerations/LifeFormsAppearance.java     |  6 +++
 .../enumerations/LifeFormsCapabilities.java   |  6 +++
 .../LifeFormsSubcategoryCISWeapons.java       |  6 +++
 .../LifeFormsSubcategoryFrenchWeapons.java    |  6 +++
 .../LifeFormsSubcategoryGermanWeapons.java    |  6 +++
 .../LifeFormsSubcategoryIranianWeapons.java   |  6 +++
 .../LifeFormsSubcategoryUKWeapons.java        |  6 +++
 .../LifeFormsSubcategoryUSWeapons.java        |  6 +++
 .../enumerations/LifeSavingEquipment.java     |  6 +++
 .../LinearObjectAppearanceBreach.java         |  6 +++
 .../LinearObjectAppearanceExhaustSmoke.java   |  6 +++
 ...arObjectAppearanceMinefieldLaneMarker.java |  6 +++
 .../LinearObjectAppearanceSpeedBump.java      |  6 +++
 ...tAppearanceTankDitchAndConcertinaWire.java |  6 +++
 .../LinearObjectAppearanceWire.java           |  6 +++
 .../Link1111BDataTerminalSetIndicator.java    |  6 +++
 .../enumerations/Link1111BFidelityLevel.java  |  6 +++
 .../Link1111BModeofOperation.java             |  6 +++
 .../enumerations/Link1111BTerminalMode.java   |  6 +++
 .../nps/moves/dis7/enumerations/Material.java |  6 +++
 .../MinefieldAppearanceActiveStatus.java      |  6 +++
 .../enumerations/MinefieldAppearanceLane.java |  6 +++
 .../MinefieldAppearanceMinefieldType.java     |  6 +++
 .../MinefieldAppearanceState.java             |  6 +++
 .../enumerations/MinefieldDataFusing.java     |  6 +++
 .../MinefieldDataPaintScheme.java             |  6 +++
 .../enumerations/MinefieldFusingFuseType.java |  6 +++
 .../MinefieldPaintSchemeAlgae.java            |  6 +++
 .../MinefieldPaintSchemePaintScheme.java      |  6 +++
 .../enumerations/MinefieldSensorTypes.java    |  6 +++
 .../MinefieldSensorTypesFLIR.java             |  6 +++
 .../MinefieldSensorTypesLaser.java            |  6 +++
 .../MinefieldSensorTypesMagnetic.java         |  6 +++
 .../MinefieldSensorTypesMultispectral.java    |  6 +++
 .../MinefieldSensorTypesOptical.java          |  6 +++
 .../MinefieldSensorTypesPhysical.java         |  6 +++
 .../MinefieldSensorTypesRADAR.java            |  6 +++
 .../MinefieldSensorTypesSONAR.java            |  6 +++
 .../MinefieldStateAppearanceBitMap.java       |  6 +++
 .../MinefieldStateProtocolMode.java           |  6 +++
 .../dis7/enumerations/Mode5IFFMission.java    |  6 +++
 .../enumerations/Mode5LevelSelection.java     |  6 +++
 .../enumerations/Mode5LocationErrors.java     |  6 +++
 .../Mode5MessageFormatsStatus.java            |  6 +++
 .../dis7/enumerations/Mode5PlatformType.java  |  6 +++
 .../moves/dis7/enumerations/Mode5Reply.java   |  6 +++
 .../Mode5SAltitudeResolution.java             |  6 +++
 .../dis7/enumerations/Mode5SquitterType.java  |  6 +++
 .../enumerations/ModeCAltitudeIndicator.java  |  6 +++
 .../ModeSInterrogatorIdentifierICType.java    |  6 +++
 .../ModeSInterrogatorStatusTransmitState.java |  6 +++
 .../ModeSSquitterRecordSource.java            |  6 +++
 .../dis7/enumerations/ModeSSquitterType.java  |  6 +++
 .../dis7/enumerations/MunitionAppearance.java |  6 +++
 .../enumerations/MunitionCapabilities.java    |  6 +++
 .../dis7/enumerations/MunitionCategory.java   |  6 +++
 .../enumerations/MunitionDescriptorFuse.java  |  6 +++
 .../MunitionDescriptorWarhead.java            |  6 +++
 .../dis7/enumerations/MunitionDomain.java     |  6 +++
 .../MunitionExpendableStatus.java             |  6 +++
 .../NETIDRecordFrequencyTable.java            |  6 +++
 .../dis7/enumerations/NETIDRecordMode.java    |  6 +++
 .../dis7/enumerations/NavigationSource.java   |  6 +++
 .../NonHumanLifeFormsAppearance.java          |  6 +++
 .../moves/dis7/enumerations/ObjectKind.java   |  6 +++
 .../ObjectStateAppearanceGeneral.java         |  6 +++
 .../ObjectStateModificationArealObject.java   |  6 +++
 .../ObjectStateModificationLinearObject.java  |  6 +++
 .../ObjectStateModificationPointObject.java   |  6 +++
 .../dis7/enumerations/OwnershipStatus.java    |  6 +++
 .../moves/dis7/enumerations/Parachute.java    |  6 +++
 .../PhysicalAssociationTypeGroups.java        |  6 +++
 .../enumerations/PlatformAirCategory.java     |  6 +++
 ...ivilianFixedWingAircraftSubcategories.java |  6 +++
 ...latformAirCivilianGliderSubcategories.java |  6 +++
 ...ormAirCivilianHelicopterSubcategories.java |  6 +++
 ...ianLighterthanAirAirshipSubcategories.java |  6 +++
 ...ianLighterthanAirBalloonSubcategories.java |  6 +++
 ...ightNonrigidWingAircraftSubcategories.java |  6 +++
 ...ralightRigidWingAircraftSubcategories.java |  6 +++
 .../dis7/enumerations/PlatformDomain.java     |  6 +++
 .../PlatformLandBusSubcategories.java         |  6 +++
 .../PlatformLandCarSubcategories.java         |  6 +++
 .../enumerations/PlatformLandCategory.java    |  6 +++
 ...tructionSpecialtyVehicleSubcategories.java |  6 +++
 ...LandFarmSpecialtyVehicleSubcategories.java |  6 +++
 .../PlatformLandMotorcycleSubcategories.java  |  6 +++
 ...ndMultipleUnitCargoTruckSubcategories.java |  6 +++
 ...nitUtilityEmergencyTruckSubcategories.java |  6 +++
 ...PlatformLandNonmotorizedSubcategories.java |  6 +++
 ...PlatformLandRecreationalSubcategories.java |  6 +++
 ...LandSingleUnitCargoTruckSubcategories.java |  6 +++
 ...nitUtilityEmergencyTruckSubcategories.java |  6 +++
 .../PlatformLandTrailerSubcategories.java     |  6 +++
 .../PlatformLandTrainsSubcategories.java      |  6 +++
 ...mLandUtilityEmergencyCarSubcategories.java |  6 +++
 .../enumerations/PlatformSpaceCategory.java   |  6 +++
 .../PlatformSubsurfaceCategory.java           |  6 +++
 ...CivilianSemiSubmersiblesSubcategories.java |  6 +++
 ...surfaceCivilianSubmarineSubcategories.java |  6 +++
 ...rfaceCivilianSubmersibleSubcategories.java |  6 +++
 .../enumerations/PlatformSurfaceCategory.java |  6 +++
 ...tformSurfaceDryCargoShipSubcategories.java |  6 +++
 ...formSurfaceFishingVesselSubcategories.java |  6 +++
 ...tformSurfaceOtherVesselsSubcategories.java |  6 +++
 ...rmSurfacePassengerVesselSubcategories.java |  6 +++
 ...mSurfacePrivateMotorboatSubcategories.java |  6 +++
 ...rmSurfacePrivateSailboatSubcategories.java |  6 +++
 ...formSurfaceSupportVesselSubcategories.java |  6 +++
 .../PlatformSurfaceTankerSubcategories.java   |  6 +++
 .../PointObjectAppearanceAirGroundBurst.java  |  6 +++
 .../PointObjectAppearanceBuildingRubble.java  |  6 +++
 ...ointObjectAppearanceBuildingStructure.java |  6 +++
 .../PointObjectAppearanceCrater.java          |  6 +++
 ...intObjectAppearanceDisturbedEarthRoad.java |  6 +++
 ...ointObjectAppearanceLogCribAbatisEtAl.java |  6 +++
 .../PointObjectAppearancePothole.java         |  6 +++
 .../PointObjectAppearanceRibbonBridge.java    |  6 +++
 ...jectAppearanceStationaryBridgeAndAVLB.java |  6 +++
 .../PointObjectAppearanceTree.java            |  6 +++
 .../dis7/enumerations/RadioAppearance.java    |  6 +++
 .../dis7/enumerations/RadioCapabilities.java  |  6 +++
 .../dis7/enumerations/RadioCategory.java      |  6 +++
 .../dis7/enumerations/RadioSubcategory.java   |  6 +++
 .../enumerations/ReceiverReceiverState.java   |  6 +++
 .../enumerations/RecordQueryREventType.java   |  6 +++
 .../dis7/enumerations/RecordREventType.java   |  6 +++
 .../enumerations/RepairCompleteRepair.java    |  6 +++
 .../moves/dis7/enumerations/RepairGroups.java |  6 +++
 .../RepairResponseRepairResult.java           |  6 +++
 .../dis7/enumerations/ReplyAmplification.java |  6 +++
 .../RequiredReliabilityService.java           |  6 +++
 .../nps/moves/dis7/enumerations/Season.java   |  6 +++
 .../enumerations/SensorEmitterAppearance.java |  6 +++
 .../SensorEmitterCapabilities.java            |  6 +++
 .../enumerations/SensorEmitterCategory.java   |  6 +++
 .../dis7/enumerations/SensorOnOffStatus.java  |  6 +++
 ...sorRecordSensorTypeOtherActiveSensors.java |  6 +++
 .../SensorRecordSensorTypePassiveSensors.java |  6 +++
 .../dis7/enumerations/SensorTypeSource.java   |  6 +++
 .../SeparationVPPreEntityIndicator.java       |  6 +++
 .../SeparationVPReasonforSeparation.java      |  6 +++
 .../ServiceRequestServiceTypeRequested.java   |  6 +++
 .../enumerations/SignalEncodingClass.java     |  6 +++
 .../dis7/enumerations/SignalEncodingType.java |  6 +++
 .../dis7/enumerations/SignalTDLType.java      |  6 +++
 ...ignalUserProtocolIdentificationNumber.java |  6 +++
 .../enumerations/SpacePlatformAppearance.java |  6 +++
 .../SpacePlatformCapabilities.java            |  6 +++
 ...icDimensionEnumerationsforAirAreaSize.java |  6 +++
 ...cDimensionEnumerationsforLandAreaSize.java |  6 +++
 .../dis7/enumerations/SpotChaffStatus.java    |  6 +++
 .../StopFreezeFrozenBehavior.java             |  6 +++
 .../dis7/enumerations/StopFreezeReason.java   |  6 +++
 .../SubcategoriesforAirCategory200Bird.java   |  6 +++
 .../SubcategoriesforAirCategory201Insect.java |  6 +++
 .../SubcategoriesforAirCategory202Mammal.java |  6 +++
 ...SubcategoriesforLandCategory200Mammal.java |  6 +++
 ...ubcategoriesforLandCategory201Reptile.java |  6 +++
 ...categoriesforLandCategory202Amphibian.java |  6 +++
 ...SubcategoriesforLandCategory203Insect.java |  6 +++
 ...bcategoriesforLandCategory204Arachnid.java |  6 +++
 ...ubcategoriesforLandCategory205Mollusk.java |  6 +++
 ...categoriesforLandCategory206Marsupial.java |  6 +++
 ...ategoriesforSubsurfaceCategory200Fish.java |  6 +++
 ...egoriesforSubsurfaceCategory201Mammal.java |  6 +++
 ...goriesforSubsurfaceCategory202Mollusk.java |  6 +++
 ...iesforSubsurfaceCategory203Crustacean.java |  6 +++
 ...egoriesforSubsurfaceCategory204Insect.java |  6 +++
 .../SubsurfacePlatformAppearance.java         |  6 +++
 .../SubsurfacePlatformCapabilities.java       |  6 +++
 .../dis7/enumerations/SupplyAppearance.java   |  6 +++
 .../dis7/enumerations/SupplyCapabilities.java |  6 +++
 .../moves/dis7/enumerations/SupplyDomain.java |  6 +++
 .../dis7/enumerations/SupplyFuelType.java     |  6 +++
 .../SurfacePlatformAppearance.java            |  6 +++
 .../SurfacePlatformCapabilities.java          |  6 +++
 .../dis7/enumerations/SurveillanceStatus.java |  6 +++
 .../TCASACASBasicAdvancedIndicator.java       |  6 +++
 .../dis7/enumerations/TCASACASIndicator.java  |  6 +++
 .../enumerations/TCASACASSoftwareVersion.java |  6 +++
 .../moves/dis7/enumerations/TCASACASType.java |  6 +++
 .../moves/dis7/enumerations/TCASIIIType.java  |  6 +++
 .../moves/dis7/enumerations/TILinkType.java   |  6 +++
 .../dis7/enumerations/TimeTypeSource.java     |  6 +++
 .../TransferControlTransferType.java          |  6 +++
 .../enumerations/TransmissionIndicator.java   |  6 +++
 ...nsmitterAntennaPatternReferenceSystem.java |  6 +++
 .../TransmitterAntennaPatternType.java        |  6 +++
 .../enumerations/TransmitterCryptoSystem.java |  6 +++
 .../TransmitterDetailAmplitudeModulation.java |  6 +++
 ...tterDetailAmplitudeandAngleModulation.java |  6 +++
 .../TransmitterDetailAnglemodulation.java     |  6 +++
 ...tterDetailCarrierPhaseShiftModulation.java |  6 +++
 ...ransmitterDetailCombinationModulation.java |  6 +++
 .../TransmitterDetailPulseModulation.java     |  6 +++
 .../TransmitterDetailSATCOMModulation.java    |  6 +++
 ...ransmitterDetailUnmodulatedModulation.java |  6 +++
 .../enumerations/TransmitterInputSource.java  |  6 +++
 .../TransmitterMajorModulation.java           |  6 +++
 .../TransmitterModulationTypeSystem.java      |  6 +++
 .../TransmitterTransmitState.java             |  6 +++
 .../TransponderInterrogatorIndicator.java     |  6 +++
 .../dis7/enumerations/TurnRateSource.java     |  6 +++
 .../UAAcousticEmitterSystemFunction.java      |  6 +++
 .../enumerations/UAAcousticSystemName.java    |  6 +++
 .../UAActiveEmissionParameterIndex.java       |  6 +++
 ...ditionalPassiveActivityParameterIndex.java |  6 +++
 .../enumerations/UAPassiveParameterIndex.java |  6 +++
 .../UAPropulsionPlantConfiguration.java       |  6 +++
 ...ulsionPlantConfigurationConfiguration.java |  6 +++
 .../dis7/enumerations/UAScanPattern.java      |  6 +++
 .../UAStateChangeUpdateIndicator.java         |  6 +++
 .../VariableParameterRecordType.java          |  6 +++
 .../dis7/enumerations/VariableRecordType.java |  6 +++
 .../VariantsforAirCategory200Bird.java        |  6 +++
 ...ReptilesAmphibiansInsectsandArachnids.java |  6 +++
 ...ariantsforSubsurfaceCategory201Mammal.java |  6 +++
 663 files changed, 6355 insertions(+), 240 deletions(-)

diff --git a/src-generated/edu/nps/moves/dis7/APA.java b/src-generated/edu/nps/moves/dis7/APA.java
index fbff553630..930bc4bcc5 100644
--- a/src-generated/edu/nps/moves/dis7/APA.java
+++ b/src-generated/edu/nps/moves/dis7/APA.java
@@ -145,7 +145,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -167,4 +167,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (value == rhs.value)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" parameterIndex: ").append(parameterIndex).append("\n");
+    sb.append(" value: ").append(value).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AcknowledgePdu.java b/src-generated/edu/nps/moves/dis7/AcknowledgePdu.java
index f68e6f2ff2..6f3b178d9b 100644
--- a/src-generated/edu/nps/moves/dis7/AcknowledgePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AcknowledgePdu.java
@@ -177,7 +177,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -195,4 +195,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (requestID == rhs.requestID)) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" acknowledgeFlag: ").append(acknowledgeFlag).append("\n");
+    sb.append(" responseFlag: ").append(responseFlag).append("\n");
+    sb.append(" requestID: ").append(requestID).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java b/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java
index 32da80ccfc..34c05da4d6 100644
--- a/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java
@@ -177,7 +177,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -195,4 +195,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (requestID == rhs.requestID)) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" acknowledgeFlag: ").append(acknowledgeFlag).append("\n");
+    sb.append(" responseFlag: ").append(responseFlag).append("\n");
+    sb.append(" requestID: ").append(requestID).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AcousticEmitter.java b/src-generated/edu/nps/moves/dis7/AcousticEmitter.java
index 8385c2f601..67be0110d6 100644
--- a/src-generated/edu/nps/moves/dis7/AcousticEmitter.java
+++ b/src-generated/edu/nps/moves/dis7/AcousticEmitter.java
@@ -169,7 +169,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -192,4 +192,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (acousticIDNumber == rhs.acousticIDNumber)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" acousticSystemName: ").append(acousticSystemName).append("\n");
+    sb.append(" acousticFunction: ").append(acousticFunction).append("\n");
+    sb.append(" acousticIDNumber: ").append(acousticIDNumber).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ActionRequestPdu.java b/src-generated/edu/nps/moves/dis7/ActionRequestPdu.java
index bb160d13b3..03e4bf2795 100644
--- a/src-generated/edu/nps/moves/dis7/ActionRequestPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionRequestPdu.java
@@ -271,7 +271,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -296,4 +296,20 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" requestID: ").append(requestID).append("\n");
+    sb.append(" actionID: ").append(actionID).append("\n");
+    sb.append(" fixedDatums: ").append("\n");
+    fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" variableDatums: ").append("\n");
+    variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java b/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java
index 4b8e367606..3a9de4df0c 100644
--- a/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java
@@ -337,7 +337,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -365,4 +365,23 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
+    sb.append(" pad1: ").append(pad1).append("\n");
+    sb.append(" pad2: ").append(pad2).append("\n");
+    sb.append(" requestID: ").append(requestID).append("\n");
+    sb.append(" actionID: ").append(actionID).append("\n");
+    sb.append(" fixedDatumRecords: ").append("\n");
+    fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" variableDatumRecords: ").append("\n");
+    variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ActionResponsePdu.java b/src-generated/edu/nps/moves/dis7/ActionResponsePdu.java
index c20f312612..2412d29c59 100644
--- a/src-generated/edu/nps/moves/dis7/ActionResponsePdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionResponsePdu.java
@@ -271,7 +271,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -296,4 +296,20 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" requestID: ").append(requestID).append("\n");
+    sb.append(" requestStatus: ").append(requestStatus).append("\n");
+    sb.append(" fixedDatums: ").append("\n");
+    fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" variableDatums: ").append("\n");
+    variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java b/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java
index 0bec73a1e0..b91c749cdf 100644
--- a/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java
@@ -271,7 +271,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -296,4 +296,20 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" requestID: ").append(requestID).append("\n");
+    sb.append(" responseStatus: ").append(responseStatus).append("\n");
+    sb.append(" fixedDatumRecords: ").append("\n");
+    fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" variableDatumRecords: ").append("\n");
+    variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AggregateIdentifier.java b/src-generated/edu/nps/moves/dis7/AggregateIdentifier.java
index 5fcf12f269..6ce0d49f06 100644
--- a/src-generated/edu/nps/moves/dis7/AggregateIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/AggregateIdentifier.java
@@ -146,7 +146,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -168,4 +168,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (aggregateID == rhs.aggregateID)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
+    sb.append(" aggregateID: ").append(aggregateID).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AggregateMarking.java b/src-generated/edu/nps/moves/dis7/AggregateMarking.java
index c6e216f022..fbbf555463 100644
--- a/src-generated/edu/nps/moves/dis7/AggregateMarking.java
+++ b/src-generated/edu/nps/moves/dis7/AggregateMarking.java
@@ -155,7 +155,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -182,4 +182,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" characterSet: ").append(characterSet).append("\n");
+    sb.append(" characters: ").append("\n");
+    sb.append(Arrays.toString(characters)).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AggregateStatePdu.java b/src-generated/edu/nps/moves/dis7/AggregateStatePdu.java
index 7e60675e32..78a0e23480 100644
--- a/src-generated/edu/nps/moves/dis7/AggregateStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AggregateStatePdu.java
@@ -622,7 +622,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -667,4 +667,35 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" aggregateID: ").append(aggregateID).append("\n");
+    sb.append(" forceID: ").append(forceID).append("\n");
+    sb.append(" aggregateState: ").append(aggregateState).append("\n");
+    sb.append(" aggregateType: ").append(aggregateType).append("\n");
+    sb.append(" formation: ").append(formation).append("\n");
+    sb.append(" aggregateMarking: ").append(aggregateMarking).append("\n");
+    sb.append(" dimensions: ").append(dimensions).append("\n");
+    sb.append(" orientation: ").append(orientation).append("\n");
+    sb.append(" centerOfMass: ").append(centerOfMass).append("\n");
+    sb.append(" velocity: ").append(velocity).append("\n");
+    sb.append(" padTo32: ").append(padTo32).append("\n");
+    sb.append(" aggregateIDList: ").append("\n");
+    aggregateIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" entityIDList: ").append("\n");
+    entityIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" silentAggregateSystemList: ").append("\n");
+    silentAggregateSystemList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" silentEntitySystemList: ").append("\n");
+    silentEntitySystemList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" variableDatumList: ").append("\n");
+    variableDatumList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AggregateType.java b/src-generated/edu/nps/moves/dis7/AggregateType.java
index d5087967a7..5e94c86dea 100644
--- a/src-generated/edu/nps/moves/dis7/AggregateType.java
+++ b/src-generated/edu/nps/moves/dis7/AggregateType.java
@@ -256,7 +256,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -283,4 +283,21 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (extra == rhs.extra)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" aggregateKind: ").append(aggregateKind).append("\n");
+    sb.append(" domain: ").append(domain).append("\n");
+    sb.append(" country: ").append(country).append("\n");
+    sb.append(" category: ").append(category).append("\n");
+    sb.append(" subcategory: ").append(subcategory).append("\n");
+    sb.append(" specificInfo: ").append(specificInfo).append("\n");
+    sb.append(" extra: ").append(extra).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AngleDeception.java b/src-generated/edu/nps/moves/dis7/AngleDeception.java
index b2fa32328c..b5119b0139 100644
--- a/src-generated/edu/nps/moves/dis7/AngleDeception.java
+++ b/src-generated/edu/nps/moves/dis7/AngleDeception.java
@@ -440,7 +440,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -476,4 +476,30 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" recordType: ").append(recordType).append("\n");
+    sb.append(" recordLength: ").append(recordLength).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+    sb.append(" emitterNumber: ").append(emitterNumber).append("\n");
+    sb.append(" beamNumber: ").append(beamNumber).append("\n");
+    sb.append(" stateIndicator: ").append(stateIndicator).append("\n");
+    sb.append(" padding2: ").append(padding2).append("\n");
+    sb.append(" azimuthOffset: ").append(azimuthOffset).append("\n");
+    sb.append(" azimuthWidth: ").append(azimuthWidth).append("\n");
+    sb.append(" azimuthPullRate: ").append(azimuthPullRate).append("\n");
+    sb.append(" azimuthPullAcceleration: ").append(azimuthPullAcceleration).append("\n");
+    sb.append(" elevationOffset: ").append(elevationOffset).append("\n");
+    sb.append(" elevationWidth: ").append(elevationWidth).append("\n");
+    sb.append(" elevationPullRate: ").append(elevationPullRate).append("\n");
+    sb.append(" elevationPullAcceleration: ").append(elevationPullAcceleration).append("\n");
+    sb.append(" padding3: ").append(padding3).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AngularVelocityVector.java b/src-generated/edu/nps/moves/dis7/AngularVelocityVector.java
index 607ebd3a9a..7c5d75dea8 100644
--- a/src-generated/edu/nps/moves/dis7/AngularVelocityVector.java
+++ b/src-generated/edu/nps/moves/dis7/AngularVelocityVector.java
@@ -169,7 +169,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -192,4 +192,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (z == rhs.z)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" x: ").append(x).append("\n");
+    sb.append(" y: ").append(y).append("\n");
+    sb.append(" z: ").append(z).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AntennaLocation.java b/src-generated/edu/nps/moves/dis7/AntennaLocation.java
index 3a849eede4..0490b93b63 100644
--- a/src-generated/edu/nps/moves/dis7/AntennaLocation.java
+++ b/src-generated/edu/nps/moves/dis7/AntennaLocation.java
@@ -145,7 +145,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -167,4 +167,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (relativeAntennaLocation.equals( rhs.relativeAntennaLocation) )) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" antennaLocation: ").append(antennaLocation).append("\n");
+    sb.append(" relativeAntennaLocation: ").append(relativeAntennaLocation).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Appearance.java b/src-generated/edu/nps/moves/dis7/Appearance.java
index b68aaf84c4..5afe3d9d9d 100644
--- a/src-generated/edu/nps/moves/dis7/Appearance.java
+++ b/src-generated/edu/nps/moves/dis7/Appearance.java
@@ -187,7 +187,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -211,4 +211,18 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (audio == rhs.audio)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" visual: ").append(visual).append("\n");
+    sb.append(" ir: ").append(ir).append("\n");
+    sb.append(" em: ").append(em).append("\n");
+    sb.append(" audio: ").append(audio).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AppearancePdu.java b/src-generated/edu/nps/moves/dis7/AppearancePdu.java
index c36b85c33d..6ffdb7b189 100644
--- a/src-generated/edu/nps/moves/dis7/AppearancePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AppearancePdu.java
@@ -275,7 +275,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -298,4 +298,22 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (appearanceFields.equals( rhs.appearanceFields) )) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" liveEntityId: ").append(liveEntityId).append("\n");
+    sb.append(" appearanceFlags: ").append(appearanceFlags).append("\n");
+    sb.append(" forceId: ").append(forceId).append("\n");
+    sb.append(" entityType: ").append(entityType).append("\n");
+    sb.append(" alternateEntityType: ").append(alternateEntityType).append("\n");
+    sb.append(" entityMarking: ").append(entityMarking).append("\n");
+    sb.append(" capabilities: ").append(capabilities).append("\n");
+    sb.append(" appearanceFields: ").append(appearanceFields).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java b/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java
index 2dd87d0ff4..64b7d1339e 100644
--- a/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java
@@ -383,7 +383,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -400,6 +400,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (referencedObjectID.equals( rhs.referencedObjectID) )) ivarsEqual = false;
      if( ! (updateNumber == rhs.updateNumber)) ivarsEqual = false;
      if( ! (forceID == rhs.forceID)) ivarsEqual = false;
+     if( ! (modifications.equals( rhs.modifications) )) ivarsEqual = false;
      if( ! (objectType.equals( rhs.objectType) )) ivarsEqual = false;
      if( ! (specificObjectAppearance == rhs.specificObjectAppearance)) ivarsEqual = false;
      if( ! (generalObjectAppearance == rhs.generalObjectAppearance)) ivarsEqual = false;
@@ -411,4 +412,26 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" objectID: ").append(objectID).append("\n");
+    sb.append(" referencedObjectID: ").append(referencedObjectID).append("\n");
+    sb.append(" updateNumber: ").append(updateNumber).append("\n");
+    sb.append(" forceID: ").append(forceID).append("\n");
+    sb.append(" modifications: ").append(modifications).append("\n");
+    sb.append(" objectType: ").append(objectType).append("\n");
+    sb.append(" specificObjectAppearance: ").append(specificObjectAppearance).append("\n");
+    sb.append(" generalObjectAppearance: ").append(generalObjectAppearance).append("\n");
+    sb.append(" requesterID: ").append(requesterID).append("\n");
+    sb.append(" receivingID: ").append(receivingID).append("\n");
+    sb.append(" objectLocation: ").append("\n");
+    objectLocation.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ArticulatedPartVP.java b/src-generated/edu/nps/moves/dis7/ArticulatedPartVP.java
index fd904f0d01..33f041c705 100644
--- a/src-generated/edu/nps/moves/dis7/ArticulatedPartVP.java
+++ b/src-generated/edu/nps/moves/dis7/ArticulatedPartVP.java
@@ -234,7 +234,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -260,4 +260,20 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (padding == rhs.padding)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" recordType: ").append(recordType).append("\n");
+    sb.append(" changeIndicator: ").append(changeIndicator).append("\n");
+    sb.append(" partAttachedTo: ").append(partAttachedTo).append("\n");
+    sb.append(" parameterType: ").append(parameterType).append("\n");
+    sb.append(" parameterValue: ").append(parameterValue).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ArticulatedPartsPdu.java b/src-generated/edu/nps/moves/dis7/ArticulatedPartsPdu.java
index 84f17d4ddc..712c983d15 100644
--- a/src-generated/edu/nps/moves/dis7/ArticulatedPartsPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ArticulatedPartsPdu.java
@@ -187,7 +187,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -207,4 +207,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" liveEntityId: ").append(liveEntityId).append("\n");
+    sb.append(" variableParameters: ").append("\n");
+    variableParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Association.java b/src-generated/edu/nps/moves/dis7/Association.java
index 35acca6048..7d3b300893 100644
--- a/src-generated/edu/nps/moves/dis7/Association.java
+++ b/src-generated/edu/nps/moves/dis7/Association.java
@@ -188,7 +188,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -212,4 +212,18 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (associatedLocation.equals( rhs.associatedLocation) )) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" associationType: ").append(associationType).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+    sb.append(" associatedEntityID: ").append(associatedEntityID).append("\n");
+    sb.append(" associatedLocation: ").append(associatedLocation).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AttachedPartVP.java b/src-generated/edu/nps/moves/dis7/AttachedPartVP.java
index 3e909528df..55cbc19804 100644
--- a/src-generated/edu/nps/moves/dis7/AttachedPartVP.java
+++ b/src-generated/edu/nps/moves/dis7/AttachedPartVP.java
@@ -212,7 +212,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -237,4 +237,19 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (attachedPartType.equals( rhs.attachedPartType) )) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" recordType: ").append(recordType).append("\n");
+    sb.append(" detachedIndicator: ").append(detachedIndicator).append("\n");
+    sb.append(" partAttachedTo: ").append(partAttachedTo).append("\n");
+    sb.append(" parameterType: ").append(parameterType).append("\n");
+    sb.append(" attachedPartType: ").append(attachedPartType).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Attribute.java b/src-generated/edu/nps/moves/dis7/Attribute.java
index 643c7cab73..0ca8d60953 100644
--- a/src-generated/edu/nps/moves/dis7/Attribute.java
+++ b/src-generated/edu/nps/moves/dis7/Attribute.java
@@ -169,7 +169,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -196,4 +196,18 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" recordType: ").append(recordType).append("\n");
+    sb.append(" recordSpecificFields: ").append("\n");
+    sb.append(Arrays.toString(recordSpecificFields)).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AttributePdu.java b/src-generated/edu/nps/moves/dis7/AttributePdu.java
index 0a3d436b2b..41799ff28c 100644
--- a/src-generated/edu/nps/moves/dis7/AttributePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AttributePdu.java
@@ -343,7 +343,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -370,4 +370,24 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" originatingSimulationAddress: ").append(originatingSimulationAddress).append("\n");
+    sb.append(" padding1: ").append(padding1).append("\n");
+    sb.append(" padding2: ").append(padding2).append("\n");
+    sb.append(" attributeRecordPduType: ").append(attributeRecordPduType).append("\n");
+    sb.append(" attributeRecordProtocolVersion: ").append(attributeRecordProtocolVersion).append("\n");
+    sb.append(" masterAttributeRecordType: ").append(masterAttributeRecordType).append("\n");
+    sb.append(" actionCode: ").append(actionCode).append("\n");
+    sb.append(" padding3: ").append(padding3).append("\n");
+    sb.append(" attributeRecordSets: ").append("\n");
+    attributeRecordSets.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AttributeRecordSet.java b/src-generated/edu/nps/moves/dis7/AttributeRecordSet.java
index af479f0d4c..03cfdba7f8 100644
--- a/src-generated/edu/nps/moves/dis7/AttributeRecordSet.java
+++ b/src-generated/edu/nps/moves/dis7/AttributeRecordSet.java
@@ -178,7 +178,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -203,4 +203,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" entityId: ").append(entityId).append("\n");
+    sb.append(" attributeRecords: ").append("\n");
+    attributeRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/BeamAntennaPattern.java b/src-generated/edu/nps/moves/dis7/BeamAntennaPattern.java
index 8598551fa5..2080a09f84 100644
--- a/src-generated/edu/nps/moves/dis7/BeamAntennaPattern.java
+++ b/src-generated/edu/nps/moves/dis7/BeamAntennaPattern.java
@@ -318,7 +318,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -348,4 +348,24 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" beamDirection: ").append(beamDirection).append("\n");
+    sb.append(" azimuthBeamwidth: ").append(azimuthBeamwidth).append("\n");
+    sb.append(" elevationBeamwidth: ").append(elevationBeamwidth).append("\n");
+    sb.append(" referenceSystem: ").append(referenceSystem).append("\n");
+    sb.append(" padding1: ").append(padding1).append("\n");
+    sb.append(" padding2: ").append(padding2).append("\n");
+    sb.append(" ez: ").append(ez).append("\n");
+    sb.append(" ex: ").append(ex).append("\n");
+    sb.append(" phase: ").append(phase).append("\n");
+    sb.append(" padding3: ").append(padding3).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/BeamData.java b/src-generated/edu/nps/moves/dis7/BeamData.java
index 4cbc8cf49d..ccc25d587f 100644
--- a/src-generated/edu/nps/moves/dis7/BeamData.java
+++ b/src-generated/edu/nps/moves/dis7/BeamData.java
@@ -213,7 +213,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -238,4 +238,19 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (beamSweepSync == rhs.beamSweepSync)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" beamAzimuthCenter: ").append(beamAzimuthCenter).append("\n");
+    sb.append(" beamAzimuthSweep: ").append(beamAzimuthSweep).append("\n");
+    sb.append(" beamElevationCenter: ").append(beamElevationCenter).append("\n");
+    sb.append(" beamElevationSweep: ").append(beamElevationSweep).append("\n");
+    sb.append(" beamSweepSync: ").append(beamSweepSync).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/BeamStatus.java b/src-generated/edu/nps/moves/dis7/BeamStatus.java
index 7625a02094..ba016360af 100644
--- a/src-generated/edu/nps/moves/dis7/BeamStatus.java
+++ b/src-generated/edu/nps/moves/dis7/BeamStatus.java
@@ -125,7 +125,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -146,4 +146,15 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (beamState == rhs.beamState)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" beamState: ").append(beamState).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/BlankingSector.java b/src-generated/edu/nps/moves/dis7/BlankingSector.java
index 7929df0491..560ff4fc3a 100644
--- a/src-generated/edu/nps/moves/dis7/BlankingSector.java
+++ b/src-generated/edu/nps/moves/dis7/BlankingSector.java
@@ -377,7 +377,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -410,4 +410,27 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" recordType: ").append(recordType).append("\n");
+    sb.append(" recordLength: ").append(recordLength).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+    sb.append(" emitterNumber: ").append(emitterNumber).append("\n");
+    sb.append(" beamNumber: ").append(beamNumber).append("\n");
+    sb.append(" stateIndicator: ").append(stateIndicator).append("\n");
+    sb.append(" padding2: ").append(padding2).append("\n");
+    sb.append(" leftAzimuth: ").append(leftAzimuth).append("\n");
+    sb.append(" rightAzimuth: ").append(rightAzimuth).append("\n");
+    sb.append(" lowerElevation: ").append(lowerElevation).append("\n");
+    sb.append(" upperElevation: ").append(upperElevation).append("\n");
+    sb.append(" residualPower: ").append(residualPower).append("\n");
+    sb.append(" padding3: ").append(padding3).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ChangeOptions.java b/src-generated/edu/nps/moves/dis7/ChangeOptions.java
index aed05aa93e..a43350fc1c 100644
--- a/src-generated/edu/nps/moves/dis7/ChangeOptions.java
+++ b/src-generated/edu/nps/moves/dis7/ChangeOptions.java
@@ -124,7 +124,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -145,4 +145,15 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (value == rhs.value)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" value: ").append(value).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ClockTime.java b/src-generated/edu/nps/moves/dis7/ClockTime.java
index 1927a3db1d..93ea45e2d6 100644
--- a/src-generated/edu/nps/moves/dis7/ClockTime.java
+++ b/src-generated/edu/nps/moves/dis7/ClockTime.java
@@ -147,7 +147,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -169,4 +169,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (timePastHour == rhs.timePastHour)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" hour: ").append(hour).append("\n");
+    sb.append(" timePastHour: ").append(timePastHour).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/CollisionElasticPdu.java b/src-generated/edu/nps/moves/dis7/CollisionElasticPdu.java
index 5ca36bba06..c3f6b7898b 100644
--- a/src-generated/edu/nps/moves/dis7/CollisionElasticPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CollisionElasticPdu.java
@@ -435,7 +435,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -465,4 +465,29 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (coefficientOfRestitution == rhs.coefficientOfRestitution)) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" issuingEntityID: ").append(issuingEntityID).append("\n");
+    sb.append(" collidingEntityID: ").append(collidingEntityID).append("\n");
+    sb.append(" collisionEventID: ").append(collisionEventID).append("\n");
+    sb.append(" pad: ").append(pad).append("\n");
+    sb.append(" contactVelocity: ").append(contactVelocity).append("\n");
+    sb.append(" mass: ").append(mass).append("\n");
+    sb.append(" locationOfImpact: ").append(locationOfImpact).append("\n");
+    sb.append(" collisionIntermediateResultXX: ").append(collisionIntermediateResultXX).append("\n");
+    sb.append(" collisionIntermediateResultXY: ").append(collisionIntermediateResultXY).append("\n");
+    sb.append(" collisionIntermediateResultXZ: ").append(collisionIntermediateResultXZ).append("\n");
+    sb.append(" collisionIntermediateResultYY: ").append(collisionIntermediateResultYY).append("\n");
+    sb.append(" collisionIntermediateResultYZ: ").append(collisionIntermediateResultYZ).append("\n");
+    sb.append(" collisionIntermediateResultZZ: ").append(collisionIntermediateResultZZ).append("\n");
+    sb.append(" unitSurfaceNormal: ").append(unitSurfaceNormal).append("\n");
+    sb.append(" coefficientOfRestitution: ").append(coefficientOfRestitution).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/CollisionPdu.java b/src-generated/edu/nps/moves/dis7/CollisionPdu.java
index 943fa6f40a..9ed693cdd2 100644
--- a/src-generated/edu/nps/moves/dis7/CollisionPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CollisionPdu.java
@@ -282,7 +282,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -305,4 +305,22 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (location.equals( rhs.location) )) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" issuingEntityID: ").append(issuingEntityID).append("\n");
+    sb.append(" collidingEntityID: ").append(collidingEntityID).append("\n");
+    sb.append(" eventID: ").append(eventID).append("\n");
+    sb.append(" collisionType: ").append(collisionType).append("\n");
+    sb.append(" pad: ").append(pad).append("\n");
+    sb.append(" velocity: ").append(velocity).append("\n");
+    sb.append(" mass: ").append(mass).append("\n");
+    sb.append(" location: ").append(location).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/CommentPdu.java b/src-generated/edu/nps/moves/dis7/CommentPdu.java
index a7776c0411..9c79fe51bb 100644
--- a/src-generated/edu/nps/moves/dis7/CommentPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CommentPdu.java
@@ -178,7 +178,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -197,4 +197,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" variableDatums: ").append("\n");
+    variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/CommentRPdu.java b/src-generated/edu/nps/moves/dis7/CommentRPdu.java
index f2309c53a1..ce481141c5 100644
--- a/src-generated/edu/nps/moves/dis7/CommentRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CommentRPdu.java
@@ -178,7 +178,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -197,4 +197,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" variableDatumRecords: ").append("\n");
+    variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/CommunicationsNodeID.java b/src-generated/edu/nps/moves/dis7/CommunicationsNodeID.java
index 6fcbb5885a..267004e4b2 100644
--- a/src-generated/edu/nps/moves/dis7/CommunicationsNodeID.java
+++ b/src-generated/edu/nps/moves/dis7/CommunicationsNodeID.java
@@ -144,7 +144,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -166,4 +166,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (elementID == rhs.elementID)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" entityID: ").append(entityID).append("\n");
+    sb.append(" elementID: ").append(elementID).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/CreateEntityPdu.java b/src-generated/edu/nps/moves/dis7/CreateEntityPdu.java
index 431bf92b55..3e64a98b3a 100644
--- a/src-generated/edu/nps/moves/dis7/CreateEntityPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CreateEntityPdu.java
@@ -133,7 +133,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -149,4 +149,15 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (requestID == rhs.requestID)) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" requestID: ").append(requestID).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java b/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java
index 49185b148f..278ac37665 100644
--- a/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java
@@ -197,7 +197,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -216,4 +216,18 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (requestID == rhs.requestID)) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
+    sb.append(" pad1: ").append(pad1).append("\n");
+    sb.append(" pad2: ").append(pad2).append("\n");
+    sb.append(" requestID: ").append(requestID).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DataFilterRecord.java b/src-generated/edu/nps/moves/dis7/DataFilterRecord.java
index 0f8686fc5f..6be3dddf62 100644
--- a/src-generated/edu/nps/moves/dis7/DataFilterRecord.java
+++ b/src-generated/edu/nps/moves/dis7/DataFilterRecord.java
@@ -136,7 +136,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -157,4 +157,26 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (bitFlags == rhs.bitFlags)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" bitFlags: ").append(bitFlags).append("\n");
+    sb.append(" GROUND_BURIAL_DEPTH_OFFSET_BIT: ").append(GROUND_BURIAL_DEPTH_OFFSET_BIT).append("\n");
+    sb.append(" WATER_BURIAL_DEPTH_OFFSET_BIT: ").append(WATER_BURIAL_DEPTH_OFFSET_BIT).append("\n");
+    sb.append(" SNOW_BURIAL_DEPTH_OFFSET_BIT: ").append(SNOW_BURIAL_DEPTH_OFFSET_BIT).append("\n");
+    sb.append(" MINE_ORIENTATION_BIT: ").append(MINE_ORIENTATION_BIT).append("\n");
+    sb.append(" THERMAL_CONSTRAST_BIT: ").append(THERMAL_CONSTRAST_BIT).append("\n");
+    sb.append(" REFLECTANCE_BIT: ").append(REFLECTANCE_BIT).append("\n");
+    sb.append(" MINE_EMPLACEMENT_TIME_BIT: ").append(MINE_EMPLACEMENT_TIME_BIT).append("\n");
+    sb.append(" TRIP_DETONATION_WIRE_BIT: ").append(TRIP_DETONATION_WIRE_BIT).append("\n");
+    sb.append(" FUSING_BIT: ").append(FUSING_BIT).append("\n");
+    sb.append(" SCALAR_DETECTION_COEFFICIENT_BIT: ").append(SCALAR_DETECTION_COEFFICIENT_BIT).append("\n");
+    sb.append(" PAINT_SCHEME_BIT: ").append(PAINT_SCHEME_BIT).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DataPdu.java b/src-generated/edu/nps/moves/dis7/DataPdu.java
index e73d66f853..e10ff19469 100644
--- a/src-generated/edu/nps/moves/dis7/DataPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataPdu.java
@@ -271,7 +271,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -296,4 +296,20 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" requestID: ").append(requestID).append("\n");
+    sb.append(" padding1: ").append(padding1).append("\n");
+    sb.append(" fixedDatums: ").append("\n");
+    fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" variableDatums: ").append("\n");
+    variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DataQueryDatumSpecification.java b/src-generated/edu/nps/moves/dis7/DataQueryDatumSpecification.java
index e6db4eb600..1ab361b9dc 100644
--- a/src-generated/edu/nps/moves/dis7/DataQueryDatumSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/DataQueryDatumSpecification.java
@@ -219,7 +219,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -247,4 +247,18 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" fixedDatumIDList: ").append("\n");
+    fixedDatumIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" variableDatumIDList: ").append("\n");
+    variableDatumIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DataQueryPdu.java b/src-generated/edu/nps/moves/dis7/DataQueryPdu.java
index 079a37edf3..c42dbdb449 100644
--- a/src-generated/edu/nps/moves/dis7/DataQueryPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataQueryPdu.java
@@ -271,7 +271,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -296,4 +296,20 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" requestID: ").append(requestID).append("\n");
+    sb.append(" timeInterval: ").append(timeInterval).append("\n");
+    sb.append(" fixedDatums: ").append("\n");
+    fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" variableDatums: ").append("\n");
+    variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java b/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java
index 3df2a13701..fe11c513c9 100644
--- a/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java
@@ -337,7 +337,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -365,4 +365,23 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
+    sb.append(" pad1: ").append(pad1).append("\n");
+    sb.append(" pad2: ").append(pad2).append("\n");
+    sb.append(" requestID: ").append(requestID).append("\n");
+    sb.append(" timeInterval: ").append(timeInterval).append("\n");
+    sb.append(" fixedDatumRecords: ").append("\n");
+    fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" variableDatumRecords: ").append("\n");
+    variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DataRPdu.java b/src-generated/edu/nps/moves/dis7/DataRPdu.java
index 5de89bdcc4..402e300ca9 100644
--- a/src-generated/edu/nps/moves/dis7/DataRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataRPdu.java
@@ -315,7 +315,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -342,4 +342,22 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" requestID: ").append(requestID).append("\n");
+    sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
+    sb.append(" pad1: ").append(pad1).append("\n");
+    sb.append(" pad2: ").append(pad2).append("\n");
+    sb.append(" fixedDatumRecords: ").append("\n");
+    fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" variableDatumRecords: ").append("\n");
+    variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DatumSpecification.java b/src-generated/edu/nps/moves/dis7/DatumSpecification.java
index 94667c8b3b..5b680667fa 100644
--- a/src-generated/edu/nps/moves/dis7/DatumSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/DatumSpecification.java
@@ -219,7 +219,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -247,4 +247,18 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" fixedDatumIDList: ").append("\n");
+    fixedDatumIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" variableDatumIDList: ").append("\n");
+    variableDatumIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DeadReckoningParameters.java b/src-generated/edu/nps/moves/dis7/DeadReckoningParameters.java
index 4a810aabbf..e28b5afbe6 100644
--- a/src-generated/edu/nps/moves/dis7/DeadReckoningParameters.java
+++ b/src-generated/edu/nps/moves/dis7/DeadReckoningParameters.java
@@ -197,7 +197,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -226,4 +226,19 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (entityAngularVelocity.equals( rhs.entityAngularVelocity) )) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" deadReckoningAlgorithm: ").append(deadReckoningAlgorithm).append("\n");
+    sb.append(" parameters: ").append("\n");
+    sb.append(Arrays.toString(parameters)).append("\n");
+    sb.append(" entityLinearAcceleration: ").append(entityLinearAcceleration).append("\n");
+    sb.append(" entityAngularVelocity: ").append(entityAngularVelocity).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DesignatorPdu.java b/src-generated/edu/nps/moves/dis7/DesignatorPdu.java
index e1b6b1ed26..ceb3cbfe59 100644
--- a/src-generated/edu/nps/moves/dis7/DesignatorPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DesignatorPdu.java
@@ -370,7 +370,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -397,4 +397,26 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (entityLinearAcceleration.equals( rhs.entityLinearAcceleration) )) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" designatingEntityID: ").append(designatingEntityID).append("\n");
+    sb.append(" codeName: ").append(codeName).append("\n");
+    sb.append(" designatedEntityID: ").append(designatedEntityID).append("\n");
+    sb.append(" designatorCode: ").append(designatorCode).append("\n");
+    sb.append(" designatorPower: ").append(designatorPower).append("\n");
+    sb.append(" designatorWavelength: ").append(designatorWavelength).append("\n");
+    sb.append(" designatorSpotWrtDesignated: ").append(designatorSpotWrtDesignated).append("\n");
+    sb.append(" designatorSpotLocation: ").append(designatorSpotLocation).append("\n");
+    sb.append(" deadReckoningAlgorithm: ").append(deadReckoningAlgorithm).append("\n");
+    sb.append(" padding1: ").append(padding1).append("\n");
+    sb.append(" padding2: ").append(padding2).append("\n");
+    sb.append(" entityLinearAcceleration: ").append(entityLinearAcceleration).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DetonationPdu.java b/src-generated/edu/nps/moves/dis7/DetonationPdu.java
index fd4a627a29..6043f5c82e 100644
--- a/src-generated/edu/nps/moves/dis7/DetonationPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DetonationPdu.java
@@ -381,7 +381,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -410,4 +410,26 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" sourceEntityID: ").append(sourceEntityID).append("\n");
+    sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
+    sb.append(" explodingEntityID: ").append(explodingEntityID).append("\n");
+    sb.append(" eventID: ").append(eventID).append("\n");
+    sb.append(" velocity: ").append(velocity).append("\n");
+    sb.append(" locationInWorldCoordinates: ").append(locationInWorldCoordinates).append("\n");
+    sb.append(" descriptor: ").append(descriptor).append("\n");
+    sb.append(" locationOfEntityCoordinates: ").append(locationOfEntityCoordinates).append("\n");
+    sb.append(" detonationResult: ").append(detonationResult).append("\n");
+    sb.append(" pad: ").append(pad).append("\n");
+    sb.append(" variableParameters: ").append("\n");
+    variableParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyAreaAimpoint.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyAreaAimpoint.java
index 0534359d6c..b536676963 100644
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyAreaAimpoint.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyAreaAimpoint.java
@@ -293,7 +293,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -324,4 +324,22 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" recordType: ").append(recordType).append("\n");
+    sb.append(" recordLength: ").append(recordLength).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+    sb.append(" padding2: ").append(padding2).append("\n");
+    sb.append(" beamAntennaParameterList: ").append("\n");
+    beamAntennaParameterList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" directedEnergyTargetEnergyDepositionRecordList: ").append("\n");
+    directedEnergyTargetEnergyDepositionRecordList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java
index d4fd52bd73..d6ad6bed4f 100644
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java
@@ -364,7 +364,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -390,9 +390,32 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (temperature == rhs.temperature)) ivarsEqual = false;
      if( ! (componentIdentification == rhs.componentIdentification)) ivarsEqual = false;
      if( ! (componentDamageStatus == rhs.componentDamageStatus)) ivarsEqual = false;
+     if( ! (componentVisualDamageStatus.equals( rhs.componentVisualDamageStatus) )) ivarsEqual = false;
      if( ! (componentVisualSmokeColor == rhs.componentVisualSmokeColor)) ivarsEqual = false;
      if( ! (fireEventID.equals( rhs.fireEventID) )) ivarsEqual = false;
      if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" recordType: ").append(recordType).append("\n");
+    sb.append(" recordLength: ").append(recordLength).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+    sb.append(" damageLocation: ").append(damageLocation).append("\n");
+    sb.append(" damageDiameter: ").append(damageDiameter).append("\n");
+    sb.append(" temperature: ").append(temperature).append("\n");
+    sb.append(" componentIdentification: ").append(componentIdentification).append("\n");
+    sb.append(" componentDamageStatus: ").append(componentDamageStatus).append("\n");
+    sb.append(" componentVisualDamageStatus: ").append(componentVisualDamageStatus).append("\n");
+    sb.append(" componentVisualSmokeColor: ").append(componentVisualSmokeColor).append("\n");
+    sb.append(" fireEventID: ").append(fireEventID).append("\n");
+    sb.append(" padding2: ").append(padding2).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java
index c62f769048..007b20e18f 100644
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java
@@ -509,7 +509,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -533,6 +533,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
      if( ! (pulseRepititionFrequency == rhs.pulseRepititionFrequency)) ivarsEqual = false;
      if( ! (pulseWidth == rhs.pulseWidth)) ivarsEqual = false;
+     if( ! (flags.equals( rhs.flags) )) ivarsEqual = false;
      if( ! (pulseShape == rhs.pulseShape)) ivarsEqual = false;
      if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
      if( ! (pad3 == rhs.pad3)) ivarsEqual = false;
@@ -543,4 +544,32 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" firingEntityID: ").append(firingEntityID).append("\n");
+    sb.append(" eventID: ").append(eventID).append("\n");
+    sb.append(" munitionType: ").append(munitionType).append("\n");
+    sb.append(" shotStartTime: ").append(shotStartTime).append("\n");
+    sb.append(" commulativeShotTime: ").append(commulativeShotTime).append("\n");
+    sb.append(" apertureEmitterLocation: ").append(apertureEmitterLocation).append("\n");
+    sb.append(" apertureDiameter: ").append(apertureDiameter).append("\n");
+    sb.append(" wavelength: ").append(wavelength).append("\n");
+    sb.append(" pad1: ").append(pad1).append("\n");
+    sb.append(" pulseRepititionFrequency: ").append(pulseRepititionFrequency).append("\n");
+    sb.append(" pulseWidth: ").append(pulseWidth).append("\n");
+    sb.append(" flags: ").append(flags).append("\n");
+    sb.append(" pulseShape: ").append(pulseShape).append("\n");
+    sb.append(" pad2: ").append(pad2).append("\n");
+    sb.append(" pad3: ").append(pad3).append("\n");
+    sb.append(" pad4: ").append(pad4).append("\n");
+    sb.append(" dERecords: ").append("\n");
+    dERecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyPrecisionAimpoint.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyPrecisionAimpoint.java
index 6ce1e1cf86..c695992bd5 100644
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyPrecisionAimpoint.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyPrecisionAimpoint.java
@@ -428,7 +428,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -463,4 +463,29 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" recordType: ").append(recordType).append("\n");
+    sb.append(" recordLength: ").append(recordLength).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+    sb.append(" targetSpotLocation: ").append(targetSpotLocation).append("\n");
+    sb.append(" targetSpotEntityLocation: ").append(targetSpotEntityLocation).append("\n");
+    sb.append(" targetSpotVelocity: ").append(targetSpotVelocity).append("\n");
+    sb.append(" targetSpotAcceleration: ").append(targetSpotAcceleration).append("\n");
+    sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
+    sb.append(" targetComponentID: ").append(targetComponentID).append("\n");
+    sb.append(" beamSpotType: ").append(beamSpotType).append("\n");
+    sb.append(" beamSpotCrossSectionSemiMajorAxis: ").append(beamSpotCrossSectionSemiMajorAxis).append("\n");
+    sb.append(" beamSpotCrossSectionSemiMinorAxis: ").append(beamSpotCrossSectionSemiMinorAxis).append("\n");
+    sb.append(" beamSpotCrossSectionOrientationAngle: ").append(beamSpotCrossSectionOrientationAngle).append("\n");
+    sb.append(" peakIrradiance: ").append(peakIrradiance).append("\n");
+    sb.append(" padding2: ").append(padding2).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyTargetEnergyDeposition.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyTargetEnergyDeposition.java
index c5ff9b0e77..1af4b25567 100644
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyTargetEnergyDeposition.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyTargetEnergyDeposition.java
@@ -168,7 +168,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -191,4 +191,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (peakIrradiance == rhs.peakIrradiance)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+    sb.append(" peakIrradiance: ").append(peakIrradiance).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DistributedEmissionsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/DistributedEmissionsFamilyPdu.java
index 6ff88c6b65..1a82803555 100644
--- a/src-generated/edu/nps/moves/dis7/DistributedEmissionsFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DistributedEmissionsFamilyPdu.java
@@ -111,7 +111,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -126,4 +126,14 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Domain.java b/src-generated/edu/nps/moves/dis7/Domain.java
index ec78ddb64a..facf362633 100644
--- a/src-generated/edu/nps/moves/dis7/Domain.java
+++ b/src-generated/edu/nps/moves/dis7/Domain.java
@@ -16,10 +16,11 @@ import edu.nps.moves.dis7.enumerations.*;
  * An example approximating a Java enum "superclass". Can't use an interface, because we need the two
  * static methods, which can't go into an interface
  */
-//@formatter:off
 public class Domain
 {
-  private Domain() { }
+  private Domain()
+  {
+  }
 
   private Object enumInst;
 
@@ -32,11 +33,20 @@ public class Domain
   private Method getDescription;
 
   //@formatter:off
-  public static Domain inst(PlatformDomain d) { return _inst(d); }  //  uid 8
+  public static Domain inst(PlatformDomain d)
+  {
+    return _inst(d);
+  }  //  uid 8
 
-  public static Domain inst(MunitionDomain d) { return _inst(d); }  //  uid 14
+  public static Domain inst(MunitionDomain d)
+  {
+    return _inst(d);
+  }  //  uid 14
 
-  public static Domain inst(SupplyDomain d) { return _inst(d); }  //  uid 600
+  public static Domain inst(SupplyDomain d)
+  {
+    return _inst(d);
+  }  //  uid 600
 
   //@formatter:on
   private static Domain _inst(Object o)
@@ -46,19 +56,19 @@ public class Domain
     d.init();
     return d;
   }
-  
+
   private void init()
   {
     Class<?> c = enumInst.getClass();
     try {
       //@formatter:off
-      marshalBuff =    c.getDeclaredMethod("marshal",       new Class[]{ByteBuffer.class});
-      marshalDos =     c.getDeclaredMethod("marshal",       new Class[]{DataOutputStream.class});
-      unmarshalBuff =  c.getDeclaredMethod("unmarshalEnum", new Class[]{ByteBuffer.class});
-      unmarshalDis =   c.getDeclaredMethod("unmarshalEnum", new Class[]{DataInputStream.class});
-      mSize =          c.getDeclaredMethod("getMarshalledSize", (Class[]) null);
-      getValue =       c.getDeclaredMethod("getValue",          (Class[]) null);
-      getDescription = c.getDeclaredMethod("getDescription",    (Class[]) null);
+      marshalBuff = c.getDeclaredMethod("marshal", new Class[]{ByteBuffer.class});
+      marshalDos = c.getDeclaredMethod("marshal", new Class[]{DataOutputStream.class});
+      unmarshalBuff = c.getDeclaredMethod("unmarshalEnum", new Class[]{ByteBuffer.class});
+      unmarshalDis = c.getDeclaredMethod("unmarshalEnum", new Class[]{DataInputStream.class});
+      mSize = c.getDeclaredMethod("getMarshalledSize", (Class[]) null);
+      getValue = c.getDeclaredMethod("getValue", (Class[]) null);
+      getDescription = c.getDeclaredMethod("getDescription", (Class[]) null);
       //@formatter:on
     }
     catch (NoSuchMethodException ex) {
@@ -153,5 +163,4 @@ public class Domain
     final Domain rhs = (Domain) obj;
     return enumInst.equals(rhs.enumInst);
   }
-  //@formatter:on
 }
diff --git a/src-generated/edu/nps/moves/dis7/EEFundamentalParameterData.java b/src-generated/edu/nps/moves/dis7/EEFundamentalParameterData.java
index 0d15a28ec4..bc613da2af 100644
--- a/src-generated/edu/nps/moves/dis7/EEFundamentalParameterData.java
+++ b/src-generated/edu/nps/moves/dis7/EEFundamentalParameterData.java
@@ -213,7 +213,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -238,4 +238,19 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (pulseWidth == rhs.pulseWidth)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" frequency: ").append(frequency).append("\n");
+    sb.append(" frequencyRange: ").append(frequencyRange).append("\n");
+    sb.append(" effectiveRadiatedPower: ").append(effectiveRadiatedPower).append("\n");
+    sb.append(" pulseRepetitionFrequency: ").append(pulseRepetitionFrequency).append("\n");
+    sb.append(" pulseWidth: ").append(pulseWidth).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ElectromagneticEmissionPdu.java b/src-generated/edu/nps/moves/dis7/ElectromagneticEmissionPdu.java
index e83b1a819e..5660a18259 100644
--- a/src-generated/edu/nps/moves/dis7/ElectromagneticEmissionPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ElectromagneticEmissionPdu.java
@@ -256,7 +256,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -279,4 +279,20 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" emittingEntityID: ").append(emittingEntityID).append("\n");
+    sb.append(" eventID: ").append(eventID).append("\n");
+    sb.append(" stateUpdateIndicator: ").append(stateUpdateIndicator).append("\n");
+    sb.append(" paddingForEmissionsPdu: ").append(paddingForEmissionsPdu).append("\n");
+    sb.append(" systems: ").append("\n");
+    systems.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ElectronicEmitter.java b/src-generated/edu/nps/moves/dis7/ElectronicEmitter.java
index c8359095a7..e0978bd33c 100644
--- a/src-generated/edu/nps/moves/dis7/ElectronicEmitter.java
+++ b/src-generated/edu/nps/moves/dis7/ElectronicEmitter.java
@@ -224,7 +224,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -251,4 +251,19 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" systemDataLength: ").append(systemDataLength).append("\n");
+    sb.append(" emitterSystem: ").append(emitterSystem).append("\n");
+    sb.append(" location: ").append(location).append("\n");
+    sb.append(" beams: ").append("\n");
+    beams.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EmitterBeam.java b/src-generated/edu/nps/moves/dis7/EmitterBeam.java
index 8016201cc6..fedd5a8689 100644
--- a/src-generated/edu/nps/moves/dis7/EmitterBeam.java
+++ b/src-generated/edu/nps/moves/dis7/EmitterBeam.java
@@ -345,7 +345,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -378,4 +378,25 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" beamDataLength: ").append(beamDataLength).append("\n");
+    sb.append(" beamNumber: ").append(beamNumber).append("\n");
+    sb.append(" beamParameterIndex: ").append(beamParameterIndex).append("\n");
+    sb.append(" fundamentalParameterData: ").append(fundamentalParameterData).append("\n");
+    sb.append(" beamData: ").append(beamData).append("\n");
+    sb.append(" beamFunction: ").append(beamFunction).append("\n");
+    sb.append(" highDensityTrackJam: ").append(highDensityTrackJam).append("\n");
+    sb.append(" beamStatus: ").append(beamStatus).append("\n");
+    sb.append(" jammingTechnique: ").append(jammingTechnique).append("\n");
+    sb.append(" trackJamData: ").append("\n");
+    trackJamData.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EmitterSystem.java b/src-generated/edu/nps/moves/dis7/EmitterSystem.java
index 5a6b1e1dee..5362b87722 100644
--- a/src-generated/edu/nps/moves/dis7/EmitterSystem.java
+++ b/src-generated/edu/nps/moves/dis7/EmitterSystem.java
@@ -169,7 +169,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -192,4 +192,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (emitterIDNumber == rhs.emitterIDNumber)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" emitterName: ").append(emitterName).append("\n");
+    sb.append(" emitterFunction: ").append(emitterFunction).append("\n");
+    sb.append(" emitterIDNumber: ").append(emitterIDNumber).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EngineFuel.java b/src-generated/edu/nps/moves/dis7/EngineFuel.java
index 5798b71f2a..cf1ed67d49 100644
--- a/src-generated/edu/nps/moves/dis7/EngineFuel.java
+++ b/src-generated/edu/nps/moves/dis7/EngineFuel.java
@@ -213,7 +213,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -238,4 +238,19 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (padding == rhs.padding)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" fuelQuantity: ").append(fuelQuantity).append("\n");
+    sb.append(" fuelMeasurementUnits: ").append(fuelMeasurementUnits).append("\n");
+    sb.append(" fuelType: ").append(fuelType).append("\n");
+    sb.append(" fuelLocation: ").append(fuelLocation).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EngineFuelReload.java b/src-generated/edu/nps/moves/dis7/EngineFuelReload.java
index 92b1dd1389..71b961eb9d 100644
--- a/src-generated/edu/nps/moves/dis7/EngineFuelReload.java
+++ b/src-generated/edu/nps/moves/dis7/EngineFuelReload.java
@@ -279,7 +279,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -307,4 +307,22 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (padding == rhs.padding)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" standardQuantity: ").append(standardQuantity).append("\n");
+    sb.append(" maximumQuantity: ").append(maximumQuantity).append("\n");
+    sb.append(" standardQuantityReloadTime: ").append(standardQuantityReloadTime).append("\n");
+    sb.append(" maximumQuantityReloadTime: ").append(maximumQuantityReloadTime).append("\n");
+    sb.append(" fuelMeasurmentUnits: ").append(fuelMeasurmentUnits).append("\n");
+    sb.append(" fuelType: ").append(fuelType).append("\n");
+    sb.append(" fuelLocation: ").append(fuelLocation).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityAssociationVP.java b/src-generated/edu/nps/moves/dis7/EntityAssociationVP.java
index f2aad6e0ee..004bf71d12 100644
--- a/src-generated/edu/nps/moves/dis7/EntityAssociationVP.java
+++ b/src-generated/edu/nps/moves/dis7/EntityAssociationVP.java
@@ -300,7 +300,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -329,4 +329,23 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (groupNumber == rhs.groupNumber)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" recordType: ").append(recordType).append("\n");
+    sb.append(" changeIndicator: ").append(changeIndicator).append("\n");
+    sb.append(" associationStatus: ").append(associationStatus).append("\n");
+    sb.append(" associationType: ").append(associationType).append("\n");
+    sb.append(" entityID: ").append(entityID).append("\n");
+    sb.append(" ownStationLocation: ").append(ownStationLocation).append("\n");
+    sb.append(" physicalConnectionType: ").append(physicalConnectionType).append("\n");
+    sb.append(" groupMemberType: ").append(groupMemberType).append("\n");
+    sb.append(" groupNumber: ").append(groupNumber).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityDamageStatusPdu.java b/src-generated/edu/nps/moves/dis7/EntityDamageStatusPdu.java
index c97a69a407..233126aada 100644
--- a/src-generated/edu/nps/moves/dis7/EntityDamageStatusPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityDamageStatusPdu.java
@@ -232,7 +232,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -254,4 +254,19 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" damagedEntityID: ").append(damagedEntityID).append("\n");
+    sb.append(" padding1: ").append(padding1).append("\n");
+    sb.append(" padding2: ").append(padding2).append("\n");
+    sb.append(" damageDescriptionRecords: ").append("\n");
+    damageDescriptionRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityID.java b/src-generated/edu/nps/moves/dis7/EntityID.java
index f625842b91..c977945529 100644
--- a/src-generated/edu/nps/moves/dis7/EntityID.java
+++ b/src-generated/edu/nps/moves/dis7/EntityID.java
@@ -169,7 +169,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -192,4 +192,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (entityID == rhs.entityID)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" siteID: ").append(siteID).append("\n");
+    sb.append(" applicationID: ").append(applicationID).append("\n");
+    sb.append(" entityID: ").append(entityID).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityIdentifier.java b/src-generated/edu/nps/moves/dis7/EntityIdentifier.java
index df94e05a04..6ad6469c80 100644
--- a/src-generated/edu/nps/moves/dis7/EntityIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/EntityIdentifier.java
@@ -146,7 +146,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -168,4 +168,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (entityNumber == rhs.entityNumber)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
+    sb.append(" entityNumber: ").append(entityNumber).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityInformationFamilyPdu.java b/src-generated/edu/nps/moves/dis7/EntityInformationFamilyPdu.java
index 8db153994d..db111cf9ed 100644
--- a/src-generated/edu/nps/moves/dis7/EntityInformationFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityInformationFamilyPdu.java
@@ -111,7 +111,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -126,4 +126,14 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityManagementFamilyPdu.java b/src-generated/edu/nps/moves/dis7/EntityManagementFamilyPdu.java
index af5544b26d..6a5a76e2d5 100644
--- a/src-generated/edu/nps/moves/dis7/EntityManagementFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityManagementFamilyPdu.java
@@ -111,7 +111,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -126,4 +126,14 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityMarking.java b/src-generated/edu/nps/moves/dis7/EntityMarking.java
index c87a03968d..82b836802f 100644
--- a/src-generated/edu/nps/moves/dis7/EntityMarking.java
+++ b/src-generated/edu/nps/moves/dis7/EntityMarking.java
@@ -155,7 +155,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -182,4 +182,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" characterSet: ").append(characterSet).append("\n");
+    sb.append(" characters: ").append("\n");
+    sb.append(Arrays.toString(characters)).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityStatePdu.java b/src-generated/edu/nps/moves/dis7/EntityStatePdu.java
index f9d7aeaa08..2e8e37533a 100644
--- a/src-generated/edu/nps/moves/dis7/EntityStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityStatePdu.java
@@ -401,7 +401,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -431,4 +431,27 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" entityID: ").append(entityID).append("\n");
+    sb.append(" forceId: ").append(forceId).append("\n");
+    sb.append(" entityType: ").append(entityType).append("\n");
+    sb.append(" alternativeEntityType: ").append(alternativeEntityType).append("\n");
+    sb.append(" entityLinearVelocity: ").append(entityLinearVelocity).append("\n");
+    sb.append(" entityLocation: ").append(entityLocation).append("\n");
+    sb.append(" entityOrientation: ").append(entityOrientation).append("\n");
+    sb.append(" entityAppearance: ").append(entityAppearance).append("\n");
+    sb.append(" deadReckoningParameters: ").append(deadReckoningParameters).append("\n");
+    sb.append(" marking: ").append(marking).append("\n");
+    sb.append(" capabilities: ").append(capabilities).append("\n");
+    sb.append(" variableParameters: ").append("\n");
+    variableParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityStateUpdatePdu.java b/src-generated/edu/nps/moves/dis7/EntityStateUpdatePdu.java
index fbd7a03ca0..6819535c91 100644
--- a/src-generated/edu/nps/moves/dis7/EntityStateUpdatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityStateUpdatePdu.java
@@ -297,7 +297,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -322,4 +322,22 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" entityID: ").append(entityID).append("\n");
+    sb.append(" padding1: ").append(padding1).append("\n");
+    sb.append(" entityLinearVelocity: ").append(entityLinearVelocity).append("\n");
+    sb.append(" entityLocation: ").append(entityLocation).append("\n");
+    sb.append(" entityOrientation: ").append(entityOrientation).append("\n");
+    sb.append(" entityAppearance: ").append(entityAppearance).append("\n");
+    sb.append(" variableParameters: ").append("\n");
+    variableParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityType.java b/src-generated/edu/nps/moves/dis7/EntityType.java
index f09c64e3bc..555fac0a10 100644
--- a/src-generated/edu/nps/moves/dis7/EntityType.java
+++ b/src-generated/edu/nps/moves/dis7/EntityType.java
@@ -255,8 +255,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    //if(getClass() != obj.getClass())
-    if(!getClass().isAssignableFrom(obj.getClass()))
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -283,4 +282,21 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (extra == rhs.extra)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" entityKind: ").append(entityKind).append("\n");
+    sb.append(" domain: ").append(domain).append("\n");
+    sb.append(" country: ").append(country).append("\n");
+    sb.append(" category: ").append(category).append("\n");
+    sb.append(" subCategory: ").append(subCategory).append("\n");
+    sb.append(" specific: ").append(specific).append("\n");
+    sb.append(" extra: ").append(extra).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityTypeRaw.java b/src-generated/edu/nps/moves/dis7/EntityTypeRaw.java
index 8aa177e050..13dade3ce5 100644
--- a/src-generated/edu/nps/moves/dis7/EntityTypeRaw.java
+++ b/src-generated/edu/nps/moves/dis7/EntityTypeRaw.java
@@ -256,7 +256,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -283,4 +283,21 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (extra == rhs.extra)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" entityKind: ").append(entityKind).append("\n");
+    sb.append(" domain: ").append(domain).append("\n");
+    sb.append(" country: ").append(country).append("\n");
+    sb.append(" category: ").append(category).append("\n");
+    sb.append(" subCategory: ").append(subCategory).append("\n");
+    sb.append(" specific: ").append(specific).append("\n");
+    sb.append(" extra: ").append(extra).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityTypeVP.java b/src-generated/edu/nps/moves/dis7/EntityTypeVP.java
index 2941c4107e..85b0f5a8af 100644
--- a/src-generated/edu/nps/moves/dis7/EntityTypeVP.java
+++ b/src-generated/edu/nps/moves/dis7/EntityTypeVP.java
@@ -212,7 +212,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -237,4 +237,19 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" recordType: ").append(recordType).append("\n");
+    sb.append(" changeIndicator: ").append(changeIndicator).append("\n");
+    sb.append(" entityType: ").append(entityType).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+    sb.append(" padding1: ").append(padding1).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Environment.java b/src-generated/edu/nps/moves/dis7/Environment.java
index 06579711ec..41d42ab018 100644
--- a/src-generated/edu/nps/moves/dis7/Environment.java
+++ b/src-generated/edu/nps/moves/dis7/Environment.java
@@ -229,7 +229,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -259,4 +259,21 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" environmentType: ").append(environmentType).append("\n");
+    sb.append(" length: ").append(length).append("\n");
+    sb.append(" index: ").append(index).append("\n");
+    sb.append(" padding1: ").append(padding1).append("\n");
+    sb.append(" geometry: ").append("\n");
+    sb.append(Arrays.toString(geometry)).append("\n");
+    sb.append(" padding2: ").append(padding2).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java b/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java
index 081bbbc234..f143f31288 100644
--- a/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java
@@ -276,7 +276,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -292,6 +292,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (environementalProcessID.equals( rhs.environementalProcessID) )) ivarsEqual = false;
      if( ! (environmentType.equals( rhs.environmentType) )) ivarsEqual = false;
      if( ! (modelType == rhs.modelType)) ivarsEqual = false;
+     if( ! (environmentStatus.equals( rhs.environmentStatus) )) ivarsEqual = false;
      if( ! (sequenceNumber == rhs.sequenceNumber)) ivarsEqual = false;
 
      for(int idx = 0; idx < environmentRecords.size(); idx++)
@@ -299,4 +300,21 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" environementalProcessID: ").append(environementalProcessID).append("\n");
+    sb.append(" environmentType: ").append(environmentType).append("\n");
+    sb.append(" modelType: ").append(modelType).append("\n");
+    sb.append(" environmentStatus: ").append(environmentStatus).append("\n");
+    sb.append(" sequenceNumber: ").append(sequenceNumber).append("\n");
+    sb.append(" environmentRecords: ").append("\n");
+    environmentRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EulerAngles.java b/src-generated/edu/nps/moves/dis7/EulerAngles.java
index bfd2c7d04e..a1635dbb4f 100644
--- a/src-generated/edu/nps/moves/dis7/EulerAngles.java
+++ b/src-generated/edu/nps/moves/dis7/EulerAngles.java
@@ -166,7 +166,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -189,4 +189,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (phi == rhs.phi)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" psi: ").append(psi).append("\n");
+    sb.append(" theta: ").append(theta).append("\n");
+    sb.append(" phi: ").append(phi).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EventIdentifier.java b/src-generated/edu/nps/moves/dis7/EventIdentifier.java
index d898580635..f4aed03c1f 100644
--- a/src-generated/edu/nps/moves/dis7/EventIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/EventIdentifier.java
@@ -145,7 +145,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -167,4 +167,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (eventNumber == rhs.eventNumber)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
+    sb.append(" eventNumber: ").append(eventNumber).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EventIdentifierLiveEntity.java b/src-generated/edu/nps/moves/dis7/EventIdentifierLiveEntity.java
index cf24792817..a561181ba2 100644
--- a/src-generated/edu/nps/moves/dis7/EventIdentifierLiveEntity.java
+++ b/src-generated/edu/nps/moves/dis7/EventIdentifierLiveEntity.java
@@ -166,7 +166,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -189,4 +189,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (eventNumber == rhs.eventNumber)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" siteNumber: ").append(siteNumber).append("\n");
+    sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
+    sb.append(" eventNumber: ").append(eventNumber).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EventReportPdu.java b/src-generated/edu/nps/moves/dis7/EventReportPdu.java
index 225f64a9f3..71f9d87240 100644
--- a/src-generated/edu/nps/moves/dis7/EventReportPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EventReportPdu.java
@@ -271,7 +271,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -296,4 +296,20 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" eventType: ").append(eventType).append("\n");
+    sb.append(" padding1: ").append(padding1).append("\n");
+    sb.append(" fixedDatums: ").append("\n");
+    fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" variableDatums: ").append("\n");
+    variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EventReportRPdu.java b/src-generated/edu/nps/moves/dis7/EventReportRPdu.java
index 8555175576..418e3e437a 100644
--- a/src-generated/edu/nps/moves/dis7/EventReportRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EventReportRPdu.java
@@ -271,7 +271,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -296,4 +296,20 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" eventType: ").append(eventType).append("\n");
+    sb.append(" pad1: ").append(pad1).append("\n");
+    sb.append(" fixedDatumRecords: ").append("\n");
+    fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" variableDatumRecords: ").append("\n");
+    variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Expendable.java b/src-generated/edu/nps/moves/dis7/Expendable.java
index b903ae4b37..ac3b70790a 100644
--- a/src-generated/edu/nps/moves/dis7/Expendable.java
+++ b/src-generated/edu/nps/moves/dis7/Expendable.java
@@ -209,7 +209,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -234,4 +234,19 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (padding == rhs.padding)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" expendable: ").append(expendable).append("\n");
+    sb.append(" station: ").append(station).append("\n");
+    sb.append(" quantity: ").append(quantity).append("\n");
+    sb.append(" expendableStatus: ").append(expendableStatus).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ExpendableDescriptor.java b/src-generated/edu/nps/moves/dis7/ExpendableDescriptor.java
index 16a1d34086..c852726772 100644
--- a/src-generated/edu/nps/moves/dis7/ExpendableDescriptor.java
+++ b/src-generated/edu/nps/moves/dis7/ExpendableDescriptor.java
@@ -146,7 +146,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -168,4 +168,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (padding == rhs.padding)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" expendableType: ").append(expendableType).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ExpendableReload.java b/src-generated/edu/nps/moves/dis7/ExpendableReload.java
index adb27b8206..2aec9a5300 100644
--- a/src-generated/edu/nps/moves/dis7/ExpendableReload.java
+++ b/src-generated/edu/nps/moves/dis7/ExpendableReload.java
@@ -229,7 +229,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -255,4 +255,20 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (maximumQuantityReloadTime == rhs.maximumQuantityReloadTime)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" expendable: ").append(expendable).append("\n");
+    sb.append(" station: ").append(station).append("\n");
+    sb.append(" standardQuantity: ").append(standardQuantity).append("\n");
+    sb.append(" maximumQuantity: ").append(maximumQuantity).append("\n");
+    sb.append(" standardQuantityReloadTime: ").append(standardQuantityReloadTime).append("\n");
+    sb.append(" maximumQuantityReloadTime: ").append(maximumQuantityReloadTime).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ExplosionDescriptor.java b/src-generated/edu/nps/moves/dis7/ExplosionDescriptor.java
index a83486283d..538329306a 100644
--- a/src-generated/edu/nps/moves/dis7/ExplosionDescriptor.java
+++ b/src-generated/edu/nps/moves/dis7/ExplosionDescriptor.java
@@ -190,7 +190,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -214,4 +214,18 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (explosiveForce == rhs.explosiveForce)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" explodingObject: ").append(explodingObject).append("\n");
+    sb.append(" explosiveMaterial: ").append(explosiveMaterial).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+    sb.append(" explosiveForce: ").append(explosiveForce).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/FalseTargetsAttribute.java b/src-generated/edu/nps/moves/dis7/FalseTargetsAttribute.java
index 6012ac02d2..3a2c4ef3cb 100644
--- a/src-generated/edu/nps/moves/dis7/FalseTargetsAttribute.java
+++ b/src-generated/edu/nps/moves/dis7/FalseTargetsAttribute.java
@@ -419,7 +419,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -454,4 +454,29 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (firstTargetOffset == rhs.firstTargetOffset)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" recordType: ").append(recordType).append("\n");
+    sb.append(" recordLength: ").append(recordLength).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+    sb.append(" emitterNumber: ").append(emitterNumber).append("\n");
+    sb.append(" beamNumber: ").append(beamNumber).append("\n");
+    sb.append(" stateIndicator: ").append(stateIndicator).append("\n");
+    sb.append(" padding2: ").append(padding2).append("\n");
+    sb.append(" padding3: ").append(padding3).append("\n");
+    sb.append(" falseTargetCount: ").append(falseTargetCount).append("\n");
+    sb.append(" walkSpeed: ").append(walkSpeed).append("\n");
+    sb.append(" walkAcceleration: ").append(walkAcceleration).append("\n");
+    sb.append(" maximumWalkDistance: ").append(maximumWalkDistance).append("\n");
+    sb.append(" keepTime: ").append(keepTime).append("\n");
+    sb.append(" echoSpacing: ").append(echoSpacing).append("\n");
+    sb.append(" firstTargetOffset: ").append(firstTargetOffset).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/FastEntityStatePdu.java b/src-generated/edu/nps/moves/dis7/FastEntityStatePdu.java
index 829d0bf8a4..514cb0b9ea 100644
--- a/src-generated/edu/nps/moves/dis7/FastEntityStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/FastEntityStatePdu.java
@@ -1016,7 +1016,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -1083,4 +1083,56 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" site: ").append(site).append("\n");
+    sb.append(" application: ").append(application).append("\n");
+    sb.append(" entity: ").append(entity).append("\n");
+    sb.append(" forceId: ").append(forceId).append("\n");
+    sb.append(" entityKind: ").append(entityKind).append("\n");
+    sb.append(" domain: ").append(domain).append("\n");
+    sb.append(" country: ").append(country).append("\n");
+    sb.append(" category: ").append(category).append("\n");
+    sb.append(" subcategory: ").append(subcategory).append("\n");
+    sb.append(" specific: ").append(specific).append("\n");
+    sb.append(" extra: ").append(extra).append("\n");
+    sb.append(" altEntityKind: ").append(altEntityKind).append("\n");
+    sb.append(" altDomain: ").append(altDomain).append("\n");
+    sb.append(" altCountry: ").append(altCountry).append("\n");
+    sb.append(" altCategory: ").append(altCategory).append("\n");
+    sb.append(" altSubcategory: ").append(altSubcategory).append("\n");
+    sb.append(" altSpecific: ").append(altSpecific).append("\n");
+    sb.append(" altExtra: ").append(altExtra).append("\n");
+    sb.append(" xVelocity: ").append(xVelocity).append("\n");
+    sb.append(" yVelocity: ").append(yVelocity).append("\n");
+    sb.append(" zVelocity: ").append(zVelocity).append("\n");
+    sb.append(" xLocation: ").append(xLocation).append("\n");
+    sb.append(" yLocation: ").append(yLocation).append("\n");
+    sb.append(" zLocation: ").append(zLocation).append("\n");
+    sb.append(" psi: ").append(psi).append("\n");
+    sb.append(" theta: ").append(theta).append("\n");
+    sb.append(" phi: ").append(phi).append("\n");
+    sb.append(" entityAppearance: ").append(entityAppearance).append("\n");
+    sb.append(" deadReckoningAlgorithm: ").append(deadReckoningAlgorithm).append("\n");
+    sb.append(" otherParameters: ").append("\n");
+    sb.append(Arrays.toString(otherParameters)).append("\n");
+    sb.append(" xAcceleration: ").append(xAcceleration).append("\n");
+    sb.append(" yAcceleration: ").append(yAcceleration).append("\n");
+    sb.append(" zAcceleration: ").append(zAcceleration).append("\n");
+    sb.append(" xAngularVelocity: ").append(xAngularVelocity).append("\n");
+    sb.append(" yAngularVelocity: ").append(yAngularVelocity).append("\n");
+    sb.append(" zAngularVelocity: ").append(zAngularVelocity).append("\n");
+    sb.append(" marking: ").append("\n");
+    sb.append(Arrays.toString(marking)).append("\n");
+    sb.append(" capabilities: ").append(capabilities).append("\n");
+    sb.append(" variableParameters: ").append("\n");
+    variableParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/FirePdu.java b/src-generated/edu/nps/moves/dis7/FirePdu.java
index 7095f39e2e..7181367da2 100644
--- a/src-generated/edu/nps/moves/dis7/FirePdu.java
+++ b/src-generated/edu/nps/moves/dis7/FirePdu.java
@@ -302,7 +302,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -326,4 +326,23 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (range == rhs.range)) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" firingEntityID: ").append(firingEntityID).append("\n");
+    sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
+    sb.append(" munitionExpendibleID: ").append(munitionExpendibleID).append("\n");
+    sb.append(" eventID: ").append(eventID).append("\n");
+    sb.append(" fireMissionIndex: ").append(fireMissionIndex).append("\n");
+    sb.append(" locationInWorldCoordinates: ").append(locationInWorldCoordinates).append("\n");
+    sb.append(" descriptor: ").append(descriptor).append("\n");
+    sb.append(" velocity: ").append(velocity).append("\n");
+    sb.append(" range: ").append(range).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/FixedDatum.java b/src-generated/edu/nps/moves/dis7/FixedDatum.java
index 6bf6d8922a..9dac5eb1b3 100644
--- a/src-generated/edu/nps/moves/dis7/FixedDatum.java
+++ b/src-generated/edu/nps/moves/dis7/FixedDatum.java
@@ -147,7 +147,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -169,4 +169,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (fixedDatumValue == rhs.fixedDatumValue)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" fixedDatumID: ").append(fixedDatumID).append("\n");
+    sb.append(" fixedDatumValue: ").append(fixedDatumValue).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/FundamentalOperationalData.java b/src-generated/edu/nps/moves/dis7/FundamentalOperationalData.java
index eab39ecace..d894af41f3 100644
--- a/src-generated/edu/nps/moves/dis7/FundamentalOperationalData.java
+++ b/src-generated/edu/nps/moves/dis7/FundamentalOperationalData.java
@@ -323,7 +323,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -353,4 +353,24 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (parameter6 == rhs.parameter6)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" systemStatus: ").append(systemStatus).append("\n");
+    sb.append(" dataField1: ").append(dataField1).append("\n");
+    sb.append(" informationLayers: ").append(informationLayers).append("\n");
+    sb.append(" dataField2: ").append(dataField2).append("\n");
+    sb.append(" parameter1: ").append(parameter1).append("\n");
+    sb.append(" parameter2: ").append(parameter2).append("\n");
+    sb.append(" parameter3: ").append(parameter3).append("\n");
+    sb.append(" parameter4: ").append(parameter4).append("\n");
+    sb.append(" parameter5: ").append(parameter5).append("\n");
+    sb.append(" parameter6: ").append(parameter6).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GridAxisDescriptor.java b/src-generated/edu/nps/moves/dis7/GridAxisDescriptor.java
index 5a79500723..8489652206 100644
--- a/src-generated/edu/nps/moves/dis7/GridAxisDescriptor.java
+++ b/src-generated/edu/nps/moves/dis7/GridAxisDescriptor.java
@@ -212,7 +212,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -237,4 +237,19 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (axisType == rhs.axisType)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" domainInitialXi: ").append(domainInitialXi).append("\n");
+    sb.append(" domainFinalXi: ").append(domainFinalXi).append("\n");
+    sb.append(" domainPointsXi: ").append(domainPointsXi).append("\n");
+    sb.append(" interleafFactor: ").append(interleafFactor).append("\n");
+    sb.append(" axisType: ").append(axisType).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GridAxisDescriptorFixed.java b/src-generated/edu/nps/moves/dis7/GridAxisDescriptorFixed.java
index cba05e47ff..b05a3c5538 100644
--- a/src-generated/edu/nps/moves/dis7/GridAxisDescriptorFixed.java
+++ b/src-generated/edu/nps/moves/dis7/GridAxisDescriptorFixed.java
@@ -154,7 +154,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -171,4 +171,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (initialIndex == rhs.initialIndex)) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" numberOfPointsOnXiAxis: ").append(numberOfPointsOnXiAxis).append("\n");
+    sb.append(" initialIndex: ").append(initialIndex).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GridAxisDescriptorVariable.java b/src-generated/edu/nps/moves/dis7/GridAxisDescriptorVariable.java
index 97aa9d2580..b83ba1ed84 100644
--- a/src-generated/edu/nps/moves/dis7/GridAxisDescriptorVariable.java
+++ b/src-generated/edu/nps/moves/dis7/GridAxisDescriptorVariable.java
@@ -236,7 +236,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -261,4 +261,21 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" numberOfPointsOnXiAxis: ").append(numberOfPointsOnXiAxis).append("\n");
+    sb.append(" initialIndex: ").append(initialIndex).append("\n");
+    sb.append(" coordinateScaleXi: ").append(coordinateScaleXi).append("\n");
+    sb.append(" coordinateOffsetXi: ").append(coordinateOffsetXi).append("\n");
+    sb.append(" xiValues: ").append("\n");
+    sb.append(Arrays.toString(xiValues)).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GridData.java b/src-generated/edu/nps/moves/dis7/GridData.java
index a219dbcf21..00ac74dbec 100644
--- a/src-generated/edu/nps/moves/dis7/GridData.java
+++ b/src-generated/edu/nps/moves/dis7/GridData.java
@@ -147,7 +147,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -169,4 +169,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (dataRepresentation == rhs.dataRepresentation)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" sampleType: ").append(sampleType).append("\n");
+    sb.append(" dataRepresentation: ").append(dataRepresentation).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GridDataType0.java b/src-generated/edu/nps/moves/dis7/GridDataType0.java
index baeb3fa3c1..1ccda79fc1 100644
--- a/src-generated/edu/nps/moves/dis7/GridDataType0.java
+++ b/src-generated/edu/nps/moves/dis7/GridDataType0.java
@@ -155,7 +155,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -176,4 +176,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" dataValues: ").append("\n");
+    sb.append(Arrays.toString(dataValues)).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GridDataType1.java b/src-generated/edu/nps/moves/dis7/GridDataType1.java
index b3cad1ce1b..7b19a2dfe5 100644
--- a/src-generated/edu/nps/moves/dis7/GridDataType1.java
+++ b/src-generated/edu/nps/moves/dis7/GridDataType1.java
@@ -197,7 +197,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -220,4 +220,19 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" fieldScale: ").append(fieldScale).append("\n");
+    sb.append(" fieldOffset: ").append(fieldOffset).append("\n");
+    sb.append(" dataValues: ").append("\n");
+    sb.append(Arrays.toString(dataValues)).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GridDataType2.java b/src-generated/edu/nps/moves/dis7/GridDataType2.java
index 3ee6244a2e..09966f18a4 100644
--- a/src-generated/edu/nps/moves/dis7/GridDataType2.java
+++ b/src-generated/edu/nps/moves/dis7/GridDataType2.java
@@ -168,7 +168,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -190,4 +190,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" padding: ").append(padding).append("\n");
+    sb.append(" dataValues: ").append("\n");
+    sb.append(Arrays.toString(dataValues)).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GriddedDataPdu.java b/src-generated/edu/nps/moves/dis7/GriddedDataPdu.java
index da18ac21aa..2020bd9c1a 100644
--- a/src-generated/edu/nps/moves/dis7/GriddedDataPdu.java
+++ b/src-generated/edu/nps/moves/dis7/GriddedDataPdu.java
@@ -500,7 +500,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -536,4 +536,31 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" environmentalSimulationApplicationID: ").append(environmentalSimulationApplicationID).append("\n");
+    sb.append(" fieldNumber: ").append(fieldNumber).append("\n");
+    sb.append(" pduNumber: ").append(pduNumber).append("\n");
+    sb.append(" pduTotal: ").append(pduTotal).append("\n");
+    sb.append(" coordinateSystem: ").append(coordinateSystem).append("\n");
+    sb.append(" constantGrid: ").append(constantGrid).append("\n");
+    sb.append(" environmentType: ").append(environmentType).append("\n");
+    sb.append(" orientation: ").append(orientation).append("\n");
+    sb.append(" sampleTime: ").append(sampleTime).append("\n");
+    sb.append(" totalValues: ").append(totalValues).append("\n");
+    sb.append(" vectorDimension: ").append(vectorDimension).append("\n");
+    sb.append(" padding1: ").append(padding1).append("\n");
+    sb.append(" padding2: ").append(padding2).append("\n");
+    sb.append(" gridAxisDescriptors: ").append("\n");
+    gridAxisDescriptors.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" gridDataRecords: ").append("\n");
+    gridDataRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GroupID.java b/src-generated/edu/nps/moves/dis7/GroupID.java
index ba05723a77..e3cf763ae1 100644
--- a/src-generated/edu/nps/moves/dis7/GroupID.java
+++ b/src-generated/edu/nps/moves/dis7/GroupID.java
@@ -146,7 +146,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -168,4 +168,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (groupNumber == rhs.groupNumber)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
+    sb.append(" groupNumber: ").append(groupNumber).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IFFData.java b/src-generated/edu/nps/moves/dis7/IFFData.java
index 45cc407de0..42d386d635 100644
--- a/src-generated/edu/nps/moves/dis7/IFFData.java
+++ b/src-generated/edu/nps/moves/dis7/IFFData.java
@@ -184,7 +184,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -212,4 +212,19 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" recordType: ").append(recordType).append("\n");
+    sb.append(" recordLength: ").append(recordLength).append("\n");
+    sb.append(" recordSpecificFields: ").append("\n");
+    sb.append(Arrays.toString(recordSpecificFields)).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IFFFundamentalParameterData.java b/src-generated/edu/nps/moves/dis7/IFFFundamentalParameterData.java
index 4a306b925b..8a5433b9f8 100644
--- a/src-generated/edu/nps/moves/dis7/IFFFundamentalParameterData.java
+++ b/src-generated/edu/nps/moves/dis7/IFFFundamentalParameterData.java
@@ -265,7 +265,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -297,4 +297,22 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" erp: ").append(erp).append("\n");
+    sb.append(" frequency: ").append(frequency).append("\n");
+    sb.append(" pgrf: ").append(pgrf).append("\n");
+    sb.append(" pulseWidth: ").append(pulseWidth).append("\n");
+    sb.append(" burstLength: ").append(burstLength).append("\n");
+    sb.append(" applicableModes: ").append(applicableModes).append("\n");
+    sb.append(" systemSpecificData: ").append("\n");
+    sb.append(Arrays.toString(systemSpecificData)).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IFFLayer2Pdu.java b/src-generated/edu/nps/moves/dis7/IFFLayer2Pdu.java
index 1565e6bf5d..1f2d1b55fa 100644
--- a/src-generated/edu/nps/moves/dis7/IFFLayer2Pdu.java
+++ b/src-generated/edu/nps/moves/dis7/IFFLayer2Pdu.java
@@ -251,7 +251,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -274,4 +274,20 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" layerHeader: ").append(layerHeader).append("\n");
+    sb.append(" beamData: ").append(beamData).append("\n");
+    sb.append(" secondaryOpParameter1: ").append(secondaryOpParameter1).append("\n");
+    sb.append(" secondaryOpParameter2: ").append(secondaryOpParameter2).append("\n");
+    sb.append(" fundamentalIFFParameters: ").append("\n");
+    fundamentalIFFParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IFFPdu.java b/src-generated/edu/nps/moves/dis7/IFFPdu.java
index 400f3ff31b..1c8372d1ea 100644
--- a/src-generated/edu/nps/moves/dis7/IFFPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IFFPdu.java
@@ -257,7 +257,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -279,4 +279,21 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (fundamentalParameters.equals( rhs.fundamentalParameters) )) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" emittingEntityId: ").append(emittingEntityId).append("\n");
+    sb.append(" eventID: ").append(eventID).append("\n");
+    sb.append(" location: ").append(location).append("\n");
+    sb.append(" systemID: ").append(systemID).append("\n");
+    sb.append(" systemDesignator: ").append(systemDesignator).append("\n");
+    sb.append(" systemSpecificData: ").append(systemSpecificData).append("\n");
+    sb.append(" fundamentalParameters: ").append(fundamentalParameters).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IOCommsNodeRecord.java b/src-generated/edu/nps/moves/dis7/IOCommsNodeRecord.java
index 937bb97bb2..3cbe86cbdf 100644
--- a/src-generated/edu/nps/moves/dis7/IOCommsNodeRecord.java
+++ b/src-generated/edu/nps/moves/dis7/IOCommsNodeRecord.java
@@ -216,7 +216,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -236,4 +236,19 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (commsNodeId.equals( rhs.commsNodeId) )) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" recordType: ").append(recordType).append("\n");
+    sb.append(" recordLength: ").append(recordLength).append("\n");
+    sb.append(" commsNodeType: ").append(commsNodeType).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+    sb.append(" commsNodeId: ").append(commsNodeId).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IOEffectRecord.java b/src-generated/edu/nps/moves/dis7/IOEffectRecord.java
index 45bfd171e7..481212e6da 100644
--- a/src-generated/edu/nps/moves/dis7/IOEffectRecord.java
+++ b/src-generated/edu/nps/moves/dis7/IOEffectRecord.java
@@ -304,7 +304,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -328,4 +328,23 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (padding == rhs.padding)) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" recordType: ").append(recordType).append("\n");
+    sb.append(" recordLength: ").append(recordLength).append("\n");
+    sb.append(" ioStatus: ").append(ioStatus).append("\n");
+    sb.append(" ioLinkType: ").append(ioLinkType).append("\n");
+    sb.append(" ioEffect: ").append(ioEffect).append("\n");
+    sb.append(" ioEffectDutyCycle: ").append(ioEffectDutyCycle).append("\n");
+    sb.append(" ioEffectDuration: ").append(ioEffectDuration).append("\n");
+    sb.append(" ioProcess: ").append(ioProcess).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IORecord.java b/src-generated/edu/nps/moves/dis7/IORecord.java
index e13038a103..9125568b2f 100644
--- a/src-generated/edu/nps/moves/dis7/IORecord.java
+++ b/src-generated/edu/nps/moves/dis7/IORecord.java
@@ -103,7 +103,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -123,4 +123,14 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IffDataSpecification.java b/src-generated/edu/nps/moves/dis7/IffDataSpecification.java
index 691389599c..b9c54003f0 100644
--- a/src-generated/edu/nps/moves/dis7/IffDataSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/IffDataSpecification.java
@@ -161,7 +161,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -185,4 +185,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" iffDataRecords: ").append("\n");
+    iffDataRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/InformationOperationsActionPdu.java b/src-generated/edu/nps/moves/dis7/InformationOperationsActionPdu.java
index 9e4d9bf4f4..5c0bb54cdd 100644
--- a/src-generated/edu/nps/moves/dis7/InformationOperationsActionPdu.java
+++ b/src-generated/edu/nps/moves/dis7/InformationOperationsActionPdu.java
@@ -380,7 +380,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -409,4 +409,26 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" receivingSimID: ").append(receivingSimID).append("\n");
+    sb.append(" requestID: ").append(requestID).append("\n");
+    sb.append(" IOWarfareType: ").append(IOWarfareType).append("\n");
+    sb.append(" IOSimulationSource: ").append(IOSimulationSource).append("\n");
+    sb.append(" IOActionType: ").append(IOActionType).append("\n");
+    sb.append(" IOActionPhase: ").append(IOActionPhase).append("\n");
+    sb.append(" padding1: ").append(padding1).append("\n");
+    sb.append(" ioAttackerID: ").append(ioAttackerID).append("\n");
+    sb.append(" ioPrimaryTargetID: ").append(ioPrimaryTargetID).append("\n");
+    sb.append(" padding2: ").append(padding2).append("\n");
+    sb.append(" ioRecords: ").append("\n");
+    ioRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/InformationOperationsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/InformationOperationsFamilyPdu.java
index 5d9f612b70..bf71b47377 100644
--- a/src-generated/edu/nps/moves/dis7/InformationOperationsFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/InformationOperationsFamilyPdu.java
@@ -131,7 +131,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -147,4 +147,15 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (originatingSimID.equals( rhs.originatingSimID) )) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" originatingSimID: ").append(originatingSimID).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/InformationOperationsReportPdu.java b/src-generated/edu/nps/moves/dis7/InformationOperationsReportPdu.java
index 487f6c6c8f..fcb2e61d10 100644
--- a/src-generated/edu/nps/moves/dis7/InformationOperationsReportPdu.java
+++ b/src-generated/edu/nps/moves/dis7/InformationOperationsReportPdu.java
@@ -314,7 +314,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -340,4 +340,23 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" ioSimSource: ").append(ioSimSource).append("\n");
+    sb.append(" ioReportType: ").append(ioReportType).append("\n");
+    sb.append(" padding1: ").append(padding1).append("\n");
+    sb.append(" ioAttackerID: ").append(ioAttackerID).append("\n");
+    sb.append(" ioPrimaryTargetID: ").append(ioPrimaryTargetID).append("\n");
+    sb.append(" padding2: ").append(padding2).append("\n");
+    sb.append(" padding3: ").append(padding3).append("\n");
+    sb.append(" ioRecords: ").append("\n");
+    ioRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IntercomCommunicationsParameters.java b/src-generated/edu/nps/moves/dis7/IntercomCommunicationsParameters.java
index 3f73fc1c19..c4053a2311 100644
--- a/src-generated/edu/nps/moves/dis7/IntercomCommunicationsParameters.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomCommunicationsParameters.java
@@ -185,7 +185,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -213,4 +213,19 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" recordType: ").append(recordType).append("\n");
+    sb.append(" recordLength: ").append(recordLength).append("\n");
+    sb.append(" recordSpecificField: ").append("\n");
+    sb.append(Arrays.toString(recordSpecificField)).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IntercomControlPdu.java b/src-generated/edu/nps/moves/dis7/IntercomControlPdu.java
index 0e73300096..40f65aaf0e 100644
--- a/src-generated/edu/nps/moves/dis7/IntercomControlPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomControlPdu.java
@@ -407,7 +407,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -437,4 +437,27 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" controlType: ").append(controlType).append("\n");
+    sb.append(" communicationsChannelType: ").append(communicationsChannelType).append("\n");
+    sb.append(" sourceEntityID: ").append(sourceEntityID).append("\n");
+    sb.append(" sourceIntercomNumber: ").append(sourceIntercomNumber).append("\n");
+    sb.append(" sourceLineID: ").append(sourceLineID).append("\n");
+    sb.append(" transmitPriority: ").append(transmitPriority).append("\n");
+    sb.append(" transmitLineState: ").append(transmitLineState).append("\n");
+    sb.append(" command: ").append(command).append("\n");
+    sb.append(" masterIntercomReferenceID: ").append(masterIntercomReferenceID).append("\n");
+    sb.append(" masterIntercomNumber: ").append(masterIntercomNumber).append("\n");
+    sb.append(" masterChannelID: ").append(masterChannelID).append("\n");
+    sb.append(" intercomParameters: ").append("\n");
+    intercomParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IntercomIdentifier.java b/src-generated/edu/nps/moves/dis7/IntercomIdentifier.java
index 7e257a4de7..43280cf6de 100644
--- a/src-generated/edu/nps/moves/dis7/IntercomIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomIdentifier.java
@@ -187,7 +187,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -211,4 +211,18 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (intercomNumber == rhs.intercomNumber)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" siteNumber: ").append(siteNumber).append("\n");
+    sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
+    sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
+    sb.append(" intercomNumber: ").append(intercomNumber).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IntercomReferenceID.java b/src-generated/edu/nps/moves/dis7/IntercomReferenceID.java
index b5ab456093..45353aa589 100644
--- a/src-generated/edu/nps/moves/dis7/IntercomReferenceID.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomReferenceID.java
@@ -165,7 +165,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -188,4 +188,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (referenceNumber == rhs.referenceNumber)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" siteNumber: ").append(siteNumber).append("\n");
+    sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
+    sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IsGroupOfPdu.java b/src-generated/edu/nps/moves/dis7/IsGroupOfPdu.java
index 5a5792f944..240013a924 100644
--- a/src-generated/edu/nps/moves/dis7/IsGroupOfPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IsGroupOfPdu.java
@@ -278,7 +278,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -302,4 +302,21 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" groupEntityID: ").append(groupEntityID).append("\n");
+    sb.append(" groupedEntityCategory: ").append(groupedEntityCategory).append("\n");
+    sb.append(" pad: ").append(pad).append("\n");
+    sb.append(" latitude: ").append(latitude).append("\n");
+    sb.append(" longitude: ").append(longitude).append("\n");
+    sb.append(" groupedEntityDescriptions: ").append("\n");
+    groupedEntityDescriptions.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IsPartOfPdu.java b/src-generated/edu/nps/moves/dis7/IsPartOfPdu.java
index eb9d358030..c44de3a3a4 100644
--- a/src-generated/edu/nps/moves/dis7/IsPartOfPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IsPartOfPdu.java
@@ -237,7 +237,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -258,4 +258,20 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (partEntityType.equals( rhs.partEntityType) )) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" orginatingEntityID: ").append(orginatingEntityID).append("\n");
+    sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
+    sb.append(" relationship: ").append(relationship).append("\n");
+    sb.append(" partLocation: ").append(partLocation).append("\n");
+    sb.append(" namedLocationID: ").append(namedLocationID).append("\n");
+    sb.append(" partEntityType: ").append(partEntityType).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/JammingTechnique.java b/src-generated/edu/nps/moves/dis7/JammingTechnique.java
index effc40f00d..dee29fd068 100644
--- a/src-generated/edu/nps/moves/dis7/JammingTechnique.java
+++ b/src-generated/edu/nps/moves/dis7/JammingTechnique.java
@@ -187,7 +187,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -211,4 +211,18 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (specific == rhs.specific)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" kind: ").append(kind).append("\n");
+    sb.append(" category: ").append(category).append("\n");
+    sb.append(" subCategory: ").append(subCategory).append("\n");
+    sb.append(" specific: ").append(specific).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java b/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java
index 1ddcaadea0..498d94d56b 100644
--- a/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java
@@ -355,7 +355,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -382,4 +382,26 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (detonationResult == rhs.detonationResult)) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" firingLiveEntityId: ").append(firingLiveEntityId).append("\n");
+    sb.append(" detonationFlag1: ").append(detonationFlag1).append("\n");
+    sb.append(" detonationFlag2: ").append(detonationFlag2).append("\n");
+    sb.append(" targetLiveEntityId: ").append(targetLiveEntityId).append("\n");
+    sb.append(" munitionLiveEntityId: ").append(munitionLiveEntityId).append("\n");
+    sb.append(" eventId: ").append(eventId).append("\n");
+    sb.append(" worldLocation: ").append(worldLocation).append("\n");
+    sb.append(" velocity: ").append(velocity).append("\n");
+    sb.append(" munitionOrientation: ").append(munitionOrientation).append("\n");
+    sb.append(" munitionDescriptor: ").append(munitionDescriptor).append("\n");
+    sb.append(" entityLocation: ").append(entityLocation).append("\n");
+    sb.append(" detonationResult: ").append(detonationResult).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LEFirePdu.java b/src-generated/edu/nps/moves/dis7/LEFirePdu.java
index 5c1e82e40c..1107ea21df 100644
--- a/src-generated/edu/nps/moves/dis7/LEFirePdu.java
+++ b/src-generated/edu/nps/moves/dis7/LEFirePdu.java
@@ -294,7 +294,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -318,4 +318,23 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (range == rhs.range)) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" firingLiveEntityId: ").append(firingLiveEntityId).append("\n");
+    sb.append(" flags: ").append(flags).append("\n");
+    sb.append(" targetLiveEntityId: ").append(targetLiveEntityId).append("\n");
+    sb.append(" munitionLiveEntityId: ").append(munitionLiveEntityId).append("\n");
+    sb.append(" eventId: ").append(eventId).append("\n");
+    sb.append(" location: ").append(location).append("\n");
+    sb.append(" munitionDescriptor: ").append(munitionDescriptor).append("\n");
+    sb.append(" velocity: ").append(velocity).append("\n");
+    sb.append(" range: ").append(range).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LEVector3FixedByte.java b/src-generated/edu/nps/moves/dis7/LEVector3FixedByte.java
index 05137b8ca7..be0d32e788 100644
--- a/src-generated/edu/nps/moves/dis7/LEVector3FixedByte.java
+++ b/src-generated/edu/nps/moves/dis7/LEVector3FixedByte.java
@@ -169,7 +169,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -192,4 +192,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (z == rhs.z)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" x: ").append(x).append("\n");
+    sb.append(" y: ").append(y).append("\n");
+    sb.append(" z: ").append(z).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LaunchedMunitionRecord.java b/src-generated/edu/nps/moves/dis7/LaunchedMunitionRecord.java
index 36e6082d9e..1944253daf 100644
--- a/src-generated/edu/nps/moves/dis7/LaunchedMunitionRecord.java
+++ b/src-generated/edu/nps/moves/dis7/LaunchedMunitionRecord.java
@@ -246,7 +246,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -273,4 +273,21 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (targetLocation.equals( rhs.targetLocation) )) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" fireEventID: ").append(fireEventID).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+    sb.append(" firingEntityID: ").append(firingEntityID).append("\n");
+    sb.append(" padding2: ").append(padding2).append("\n");
+    sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
+    sb.append(" padding3: ").append(padding3).append("\n");
+    sb.append(" targetLocation: ").append(targetLocation).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LayerHeader.java b/src-generated/edu/nps/moves/dis7/LayerHeader.java
index 888d92b4f8..66be9a5391 100644
--- a/src-generated/edu/nps/moves/dis7/LayerHeader.java
+++ b/src-generated/edu/nps/moves/dis7/LayerHeader.java
@@ -168,7 +168,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -191,4 +191,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (length == rhs.length)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" layerNumber: ").append(layerNumber).append("\n");
+    sb.append(" layerSpecificInformation: ").append(layerSpecificInformation).append("\n");
+    sb.append(" length: ").append(length).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LinearObjectStatePdu.java b/src-generated/edu/nps/moves/dis7/LinearObjectStatePdu.java
index f78c64096c..11a53e46ac 100644
--- a/src-generated/edu/nps/moves/dis7/LinearObjectStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/LinearObjectStatePdu.java
@@ -318,7 +318,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -344,4 +344,23 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" objectID: ").append(objectID).append("\n");
+    sb.append(" referencedObjectID: ").append(referencedObjectID).append("\n");
+    sb.append(" updateNumber: ").append(updateNumber).append("\n");
+    sb.append(" forceID: ").append(forceID).append("\n");
+    sb.append(" requesterID: ").append(requesterID).append("\n");
+    sb.append(" receivingID: ").append(receivingID).append("\n");
+    sb.append(" objectType: ").append(objectType).append("\n");
+    sb.append(" linearSegmentParameters: ").append("\n");
+    linearSegmentParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java b/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java
index 7df6e79933..5207717cfa 100644
--- a/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java
+++ b/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java
@@ -341,7 +341,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -360,6 +360,8 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      final LinearSegmentParameter rhs = (LinearSegmentParameter)obj;
 
      if( ! (segmentNumber == rhs.segmentNumber)) ivarsEqual = false;
+     if( ! (segmentModification.equals( rhs.segmentModification) )) ivarsEqual = false;
+     if( ! (generalSegmentAppearance.equals( rhs.generalSegmentAppearance) )) ivarsEqual = false;
      if( ! (specificSegmentAppearance == rhs.specificSegmentAppearance)) ivarsEqual = false;
      if( ! (segmentLocation.equals( rhs.segmentLocation) )) ivarsEqual = false;
      if( ! (segmentOrientation.equals( rhs.segmentOrientation) )) ivarsEqual = false;
@@ -370,4 +372,25 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (padding == rhs.padding)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" segmentNumber: ").append(segmentNumber).append("\n");
+    sb.append(" segmentModification: ").append(segmentModification).append("\n");
+    sb.append(" generalSegmentAppearance: ").append(generalSegmentAppearance).append("\n");
+    sb.append(" specificSegmentAppearance: ").append(specificSegmentAppearance).append("\n");
+    sb.append(" segmentLocation: ").append(segmentLocation).append("\n");
+    sb.append(" segmentOrientation: ").append(segmentOrientation).append("\n");
+    sb.append(" segmentLength: ").append(segmentLength).append("\n");
+    sb.append(" segmentWidth: ").append(segmentWidth).append("\n");
+    sb.append(" segmentHeight: ").append(segmentHeight).append("\n");
+    sb.append(" segmentDepth: ").append(segmentDepth).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveDeadReckoningParameters.java b/src-generated/edu/nps/moves/dis7/LiveDeadReckoningParameters.java
index 7da4ba2b6e..d3be2d8ad8 100644
--- a/src-generated/edu/nps/moves/dis7/LiveDeadReckoningParameters.java
+++ b/src-generated/edu/nps/moves/dis7/LiveDeadReckoningParameters.java
@@ -165,7 +165,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -188,4 +188,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (entityAngularVelocity.equals( rhs.entityAngularVelocity) )) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" deadReckoningAlgorithm: ").append(deadReckoningAlgorithm).append("\n");
+    sb.append(" entityLinearAcceleration: ").append(entityLinearAcceleration).append("\n");
+    sb.append(" entityAngularVelocity: ").append(entityAngularVelocity).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityFamilyPdu.java b/src-generated/edu/nps/moves/dis7/LiveEntityFamilyPdu.java
index 6b9b24df50..f2d5664836 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityFamilyPdu.java
@@ -110,7 +110,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -125,4 +125,14 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityIdentifier.java b/src-generated/edu/nps/moves/dis7/LiveEntityIdentifier.java
index 35d6cc4d67..a9ea59505f 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityIdentifier.java
@@ -146,7 +146,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -168,4 +168,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (entityNumber == rhs.entityNumber)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" liveSimulationAddress: ").append(liveSimulationAddress).append("\n");
+    sb.append(" entityNumber: ").append(entityNumber).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityLinearVelocity.java b/src-generated/edu/nps/moves/dis7/LiveEntityLinearVelocity.java
index c7ec8ab998..13f214bc01 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityLinearVelocity.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityLinearVelocity.java
@@ -166,7 +166,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -189,4 +189,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (zComponent == rhs.zComponent)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" xComponent: ").append(xComponent).append("\n");
+    sb.append(" yComponent: ").append(yComponent).append("\n");
+    sb.append(" zComponent: ").append(zComponent).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityOrientation.java b/src-generated/edu/nps/moves/dis7/LiveEntityOrientation.java
index dee032051b..211fe4300e 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityOrientation.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityOrientation.java
@@ -166,7 +166,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -189,4 +189,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (phi == rhs.phi)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" psi: ").append(psi).append("\n");
+    sb.append(" theta: ").append(theta).append("\n");
+    sb.append(" phi: ").append(phi).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityOrientation16.java b/src-generated/edu/nps/moves/dis7/LiveEntityOrientation16.java
index ec3e969045..0a66daa0b1 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityOrientation16.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityOrientation16.java
@@ -166,7 +166,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -189,4 +189,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (phi == rhs.phi)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" psi: ").append(psi).append("\n");
+    sb.append(" theta: ").append(theta).append("\n");
+    sb.append(" phi: ").append(phi).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityOrientationError.java b/src-generated/edu/nps/moves/dis7/LiveEntityOrientationError.java
index 51ffcda148..7d712b3f63 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityOrientationError.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityOrientationError.java
@@ -166,7 +166,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -189,4 +189,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (rotationError == rhs.rotationError)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" azimuthError: ").append(azimuthError).append("\n");
+    sb.append(" elevationError: ").append(elevationError).append("\n");
+    sb.append(" rotationError: ").append(rotationError).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityPdu.java b/src-generated/edu/nps/moves/dis7/LiveEntityPdu.java
index c332388650..da7e3deb98 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityPdu.java
@@ -154,7 +154,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -171,4 +171,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (padding == rhs.padding)) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" subprotocolNumber: ").append(subprotocolNumber).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityPositionError.java b/src-generated/edu/nps/moves/dis7/LiveEntityPositionError.java
index 67b78541a3..81cf461553 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityPositionError.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityPositionError.java
@@ -145,7 +145,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -167,4 +167,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (verticalError == rhs.verticalError)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" horizontalError: ").append(horizontalError).append("\n");
+    sb.append(" verticalError: ").append(verticalError).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityRelativeWorldCoordinates.java b/src-generated/edu/nps/moves/dis7/LiveEntityRelativeWorldCoordinates.java
index f0a65a3b65..8d2a238cea 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityRelativeWorldCoordinates.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityRelativeWorldCoordinates.java
@@ -187,7 +187,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -211,4 +211,18 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (deltaZ == rhs.deltaZ)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" referencePoint: ").append(referencePoint).append("\n");
+    sb.append(" deltaX: ").append(deltaX).append("\n");
+    sb.append(" deltaY: ").append(deltaY).append("\n");
+    sb.append(" deltaZ: ").append(deltaZ).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveSimulationAddress.java b/src-generated/edu/nps/moves/dis7/LiveSimulationAddress.java
index b10c8c4c45..524fe7b1e3 100644
--- a/src-generated/edu/nps/moves/dis7/LiveSimulationAddress.java
+++ b/src-generated/edu/nps/moves/dis7/LiveSimulationAddress.java
@@ -147,7 +147,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -169,4 +169,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (liveApplicationNumber == rhs.liveApplicationNumber)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" liveSiteNumber: ").append(liveSiteNumber).append("\n");
+    sb.append(" liveApplicationNumber: ").append(liveApplicationNumber).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LogisticsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/LogisticsFamilyPdu.java
index 9e12f136fa..c139fb8444 100644
--- a/src-generated/edu/nps/moves/dis7/LogisticsFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LogisticsFamilyPdu.java
@@ -111,7 +111,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -126,4 +126,14 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MineEmplacementTime.java b/src-generated/edu/nps/moves/dis7/MineEmplacementTime.java
index 1f7c926435..a8a9d957c6 100644
--- a/src-generated/edu/nps/moves/dis7/MineEmplacementTime.java
+++ b/src-generated/edu/nps/moves/dis7/MineEmplacementTime.java
@@ -144,7 +144,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -166,4 +166,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (timePastTheHour == rhs.timePastTheHour)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" hour: ").append(hour).append("\n");
+    sb.append(" timePastTheHour: ").append(timePastTheHour).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MineEntityIdentifier.java b/src-generated/edu/nps/moves/dis7/MineEntityIdentifier.java
index a22cfdae81..2d1992d154 100644
--- a/src-generated/edu/nps/moves/dis7/MineEntityIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/MineEntityIdentifier.java
@@ -146,7 +146,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -168,4 +168,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (mineEntityNumber == rhs.mineEntityNumber)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
+    sb.append(" mineEntityNumber: ").append(mineEntityNumber).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldDataPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldDataPdu.java
index 59a4f5fdd3..a8a2882751 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldDataPdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldDataPdu.java
@@ -900,7 +900,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -1002,4 +1002,56 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" minefieldID: ").append(minefieldID).append("\n");
+    sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
+    sb.append(" minefieldSequenceNumbeer: ").append(minefieldSequenceNumbeer).append("\n");
+    sb.append(" requestID: ").append(requestID).append("\n");
+    sb.append(" pduSequenceNumber: ").append(pduSequenceNumber).append("\n");
+    sb.append(" numberOfPdus: ").append(numberOfPdus).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+    sb.append(" dataFilter: ").append(dataFilter).append("\n");
+    sb.append(" mineType: ").append(mineType).append("\n");
+    sb.append(" padTo32: ").append(padTo32).append("\n");
+    sb.append(" groundBurialDepthOffset: ").append("\n");
+    sb.append(Arrays.toString(groundBurialDepthOffset)).append("\n");
+    sb.append(" waterBurialDepthOffset: ").append("\n");
+    sb.append(Arrays.toString(waterBurialDepthOffset)).append("\n");
+    sb.append(" snowBurialDepthOffset: ").append("\n");
+    sb.append(Arrays.toString(snowBurialDepthOffset)).append("\n");
+    sb.append(" thermalContrast: ").append("\n");
+    sb.append(Arrays.toString(thermalContrast)).append("\n");
+    sb.append(" reflectance: ").append("\n");
+    sb.append(Arrays.toString(reflectance)).append("\n");
+    sb.append(" mineEntityNumber: ").append("\n");
+    sb.append(Arrays.toString(mineEntityNumber)).append("\n");
+    sb.append(" scalarDetectionCoefficient: ").append("\n");
+    sb.append(Arrays.toString(scalarDetectionCoefficient)).append("\n");
+    sb.append(" padTo32_2: ").append(padTo32_2).append("\n");
+    sb.append(" numberOfTripDetonationWires: ").append("\n");
+    sb.append(Arrays.toString(numberOfTripDetonationWires)).append("\n");
+    sb.append(" padTo32_3: ").append(padTo32_3).append("\n");
+    sb.append(" numberOfVertices: ").append("\n");
+    sb.append(Arrays.toString(numberOfVertices)).append("\n");
+    sb.append(" sensorTypes: ").append("\n");
+    sensorTypes.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" mineLocation: ").append("\n");
+    mineLocation.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" mineOrientation: ").append("\n");
+    mineOrientation.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" mineEmplacementTime: ").append("\n");
+    mineEmplacementTime.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" fusing: ").append("\n");
+    fusing.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" paintScheme: ").append("\n");
+    paintScheme.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldFamilyPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldFamilyPdu.java
index afe98d1209..79fbadd5df 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldFamilyPdu.java
@@ -111,7 +111,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -126,4 +126,14 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldIdentifier.java b/src-generated/edu/nps/moves/dis7/MinefieldIdentifier.java
index 90fdb96b1f..dcfc4a943d 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldIdentifier.java
@@ -146,7 +146,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -168,4 +168,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (minefieldNumber == rhs.minefieldNumber)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
+    sb.append(" minefieldNumber: ").append(minefieldNumber).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldQueryPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldQueryPdu.java
index 02d9e19268..0fa3c104cd 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldQueryPdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldQueryPdu.java
@@ -354,7 +354,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -383,4 +383,24 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" minefieldID: ").append(minefieldID).append("\n");
+    sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
+    sb.append(" requestID: ").append(requestID).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+    sb.append(" dataFilter: ").append(dataFilter).append("\n");
+    sb.append(" requestedMineType: ").append(requestedMineType).append("\n");
+    sb.append(" requestedPerimeterPoints: ").append("\n");
+    requestedPerimeterPoints.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" sensorTypes: ").append("\n");
+    sensorTypes.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldResponseNACKPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldResponseNACKPdu.java
index 1515759946..5a72897d1f 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldResponseNACKPdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldResponseNACKPdu.java
@@ -214,7 +214,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -238,4 +238,19 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" minefieldID: ").append(minefieldID).append("\n");
+    sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
+    sb.append(" requestID: ").append(requestID).append("\n");
+    sb.append(" missingPduSequenceNumbers: ").append("\n");
+    sb.append(Arrays.toString(missingPduSequenceNumbers)).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldSensorType.java b/src-generated/edu/nps/moves/dis7/MinefieldSensorType.java
index 7028829338..d98d25845a 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldSensorType.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldSensorType.java
@@ -125,7 +125,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -146,4 +146,15 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (sensorType == rhs.sensorType)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" sensorType: ").append(sensorType).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java b/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java
index 5cfca1fccd..701097a066 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java
@@ -397,7 +397,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -416,6 +416,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (minefieldType.equals( rhs.minefieldType) )) ivarsEqual = false;
      if( ! (minefieldLocation.equals( rhs.minefieldLocation) )) ivarsEqual = false;
      if( ! (minefieldOrientation.equals( rhs.minefieldOrientation) )) ivarsEqual = false;
+     if( ! (appearance.equals( rhs.appearance) )) ivarsEqual = false;
      if( ! (protocolMode.equals( rhs.protocolMode) )) ivarsEqual = false;
 
      for(int idx = 0; idx < perimeterPoints.size(); idx++)
@@ -427,4 +428,26 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" minefieldID: ").append(minefieldID).append("\n");
+    sb.append(" minefieldSequence: ").append(minefieldSequence).append("\n");
+    sb.append(" forceID: ").append(forceID).append("\n");
+    sb.append(" minefieldType: ").append(minefieldType).append("\n");
+    sb.append(" minefieldLocation: ").append(minefieldLocation).append("\n");
+    sb.append(" minefieldOrientation: ").append(minefieldOrientation).append("\n");
+    sb.append(" appearance: ").append(appearance).append("\n");
+    sb.append(" protocolMode: ").append(protocolMode).append("\n");
+    sb.append(" perimeterPoints: ").append("\n");
+    perimeterPoints.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" mineType: ").append("\n");
+    mineType.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ModulationParameters.java b/src-generated/edu/nps/moves/dis7/ModulationParameters.java
index 3584c4ac09..fcd7a70f26 100644
--- a/src-generated/edu/nps/moves/dis7/ModulationParameters.java
+++ b/src-generated/edu/nps/moves/dis7/ModulationParameters.java
@@ -140,7 +140,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -166,4 +166,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" recordSpecificFields: ").append("\n");
+    sb.append(Arrays.toString(recordSpecificFields)).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ModulationType.java b/src-generated/edu/nps/moves/dis7/ModulationType.java
index 4015c18f76..8d218b22aa 100644
--- a/src-generated/edu/nps/moves/dis7/ModulationType.java
+++ b/src-generated/edu/nps/moves/dis7/ModulationType.java
@@ -191,7 +191,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -215,4 +215,18 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (radioSystem == rhs.radioSystem)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" spreadSpectrum: ").append(spreadSpectrum).append("\n");
+    sb.append(" majorModulation: ").append(majorModulation).append("\n");
+    sb.append(" detail: ").append(detail).append("\n");
+    sb.append(" radioSystem: ").append(radioSystem).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Munition.java b/src-generated/edu/nps/moves/dis7/Munition.java
index c50faeb54f..746f16fe61 100644
--- a/src-generated/edu/nps/moves/dis7/Munition.java
+++ b/src-generated/edu/nps/moves/dis7/Munition.java
@@ -212,7 +212,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -237,4 +237,19 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (padding == rhs.padding)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" munitionType: ").append(munitionType).append("\n");
+    sb.append(" station: ").append(station).append("\n");
+    sb.append(" quantity: ").append(quantity).append("\n");
+    sb.append(" munitionStatus: ").append(munitionStatus).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MunitionDescriptor.java b/src-generated/edu/nps/moves/dis7/MunitionDescriptor.java
index feedb76224..2d74c4e5ff 100644
--- a/src-generated/edu/nps/moves/dis7/MunitionDescriptor.java
+++ b/src-generated/edu/nps/moves/dis7/MunitionDescriptor.java
@@ -212,7 +212,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -237,4 +237,19 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (rate == rhs.rate)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" munitionType: ").append(munitionType).append("\n");
+    sb.append(" warhead: ").append(warhead).append("\n");
+    sb.append(" fuse: ").append(fuse).append("\n");
+    sb.append(" quantity: ").append(quantity).append("\n");
+    sb.append(" rate: ").append(rate).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MunitionReload.java b/src-generated/edu/nps/moves/dis7/MunitionReload.java
index 868e2b5bdb..a32cdd13d5 100644
--- a/src-generated/edu/nps/moves/dis7/MunitionReload.java
+++ b/src-generated/edu/nps/moves/dis7/MunitionReload.java
@@ -234,7 +234,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -260,4 +260,20 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (maximumQuantityReloadTime == rhs.maximumQuantityReloadTime)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" munitionType: ").append(munitionType).append("\n");
+    sb.append(" station: ").append(station).append("\n");
+    sb.append(" standardQuantity: ").append(standardQuantity).append("\n");
+    sb.append(" maximumQuantity: ").append(maximumQuantity).append("\n");
+    sb.append(" standardQuantityReloadTime: ").append(standardQuantityReloadTime).append("\n");
+    sb.append(" maximumQuantityReloadTime: ").append(maximumQuantityReloadTime).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/NamedLocationIdentification.java b/src-generated/edu/nps/moves/dis7/NamedLocationIdentification.java
index 0a0463a2e7..66c5252d85 100644
--- a/src-generated/edu/nps/moves/dis7/NamedLocationIdentification.java
+++ b/src-generated/edu/nps/moves/dis7/NamedLocationIdentification.java
@@ -147,7 +147,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -169,4 +169,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (stationNumber == rhs.stationNumber)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" stationName: ").append(stationName).append("\n");
+    sb.append(" stationNumber: ").append(stationNumber).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ObjectIdentifier.java b/src-generated/edu/nps/moves/dis7/ObjectIdentifier.java
index 070fa52858..8905f91acc 100644
--- a/src-generated/edu/nps/moves/dis7/ObjectIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/ObjectIdentifier.java
@@ -146,7 +146,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -168,4 +168,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (objectNumber == rhs.objectNumber)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
+    sb.append(" objectNumber: ").append(objectNumber).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ObjectType.java b/src-generated/edu/nps/moves/dis7/ObjectType.java
index 0093c5bf33..8f80c4b075 100644
--- a/src-generated/edu/nps/moves/dis7/ObjectType.java
+++ b/src-generated/edu/nps/moves/dis7/ObjectType.java
@@ -191,7 +191,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -215,4 +215,18 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (subCategory == rhs.subCategory)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" domain: ").append(domain).append("\n");
+    sb.append(" objectKind: ").append(objectKind).append("\n");
+    sb.append(" category: ").append(category).append("\n");
+    sb.append(" subCategory: ").append(subCategory).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/OwnershipStatusRecord.java b/src-generated/edu/nps/moves/dis7/OwnershipStatusRecord.java
index 88771eadca..ad733c34e2 100644
--- a/src-generated/edu/nps/moves/dis7/OwnershipStatusRecord.java
+++ b/src-generated/edu/nps/moves/dis7/OwnershipStatusRecord.java
@@ -168,7 +168,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -191,4 +191,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (padding == rhs.padding)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" entityId: ").append(entityId).append("\n");
+    sb.append(" ownershipStatus: ").append(ownershipStatus).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Pdu.java b/src-generated/edu/nps/moves/dis7/Pdu.java
index 97ee56ab08..aade3f6666 100644
--- a/src-generated/edu/nps/moves/dis7/Pdu.java
+++ b/src-generated/edu/nps/moves/dis7/Pdu.java
@@ -249,7 +249,7 @@ public byte[] marshal() throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -275,4 +275,20 @@ public byte[] marshal() throws Exception
      if( ! (length == rhs.length)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" protocolVersion: ").append(protocolVersion).append("\n");
+    sb.append(" exerciseID: ").append(exerciseID).append("\n");
+    sb.append(" pduType: ").append(pduType).append("\n");
+    sb.append(" protocolFamily: ").append(protocolFamily).append("\n");
+    sb.append(" timestamp: ").append(timestamp).append("\n");
+    sb.append(" length: ").append(length).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/PduBase.java b/src-generated/edu/nps/moves/dis7/PduBase.java
index 5f404c6e5b..b9ec223317 100644
--- a/src-generated/edu/nps/moves/dis7/PduBase.java
+++ b/src-generated/edu/nps/moves/dis7/PduBase.java
@@ -153,7 +153,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -170,4 +170,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (padding == rhs.padding)) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" pduStatus: ").append(pduStatus).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/PduStatus.java b/src-generated/edu/nps/moves/dis7/PduStatus.java
index ead0641821..ea751ef05a 100644
--- a/src-generated/edu/nps/moves/dis7/PduStatus.java
+++ b/src-generated/edu/nps/moves/dis7/PduStatus.java
@@ -116,4 +116,10 @@ public class PduStatus
   {
     return obj instanceof PduStatus && ((PduStatus) obj).getValue() == getValue();
   }
+  
+  @Override
+  public String toString()
+  {
+    return "PduStatus: "+ Integer.toBinaryString(getValue()+256).substring(1); // dont want to lose leading zeros
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java b/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java
index 07c4b9538e..86b0e83a2b 100644
--- a/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java
@@ -409,7 +409,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -426,14 +426,40 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (referencedObjectID.equals( rhs.referencedObjectID) )) ivarsEqual = false;
      if( ! (updateNumber == rhs.updateNumber)) ivarsEqual = false;
      if( ! (forceID == rhs.forceID)) ivarsEqual = false;
+     if( ! (modifications.equals( rhs.modifications) )) ivarsEqual = false;
      if( ! (objectType.equals( rhs.objectType) )) ivarsEqual = false;
      if( ! (objectLocation.equals( rhs.objectLocation) )) ivarsEqual = false;
      if( ! (objectOrientation.equals( rhs.objectOrientation) )) ivarsEqual = false;
      if( ! (specificObjectAppearance == rhs.specificObjectAppearance)) ivarsEqual = false;
+     if( ! (generObjectAppearance.equals( rhs.generObjectAppearance) )) ivarsEqual = false;
      if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
      if( ! (requesterID.equals( rhs.requesterID) )) ivarsEqual = false;
      if( ! (receivingID.equals( rhs.receivingID) )) ivarsEqual = false;
      if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" objectID: ").append(objectID).append("\n");
+    sb.append(" referencedObjectID: ").append(referencedObjectID).append("\n");
+    sb.append(" updateNumber: ").append(updateNumber).append("\n");
+    sb.append(" forceID: ").append(forceID).append("\n");
+    sb.append(" modifications: ").append(modifications).append("\n");
+    sb.append(" objectType: ").append(objectType).append("\n");
+    sb.append(" objectLocation: ").append(objectLocation).append("\n");
+    sb.append(" objectOrientation: ").append(objectOrientation).append("\n");
+    sb.append(" specificObjectAppearance: ").append(specificObjectAppearance).append("\n");
+    sb.append(" generObjectAppearance: ").append(generObjectAppearance).append("\n");
+    sb.append(" padding1: ").append(padding1).append("\n");
+    sb.append(" requesterID: ").append(requesterID).append("\n");
+    sb.append(" receivingID: ").append(receivingID).append("\n");
+    sb.append(" pad2: ").append(pad2).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/PropulsionSystemData.java b/src-generated/edu/nps/moves/dis7/PropulsionSystemData.java
index a48da9fa4e..aa4e2678c6 100644
--- a/src-generated/edu/nps/moves/dis7/PropulsionSystemData.java
+++ b/src-generated/edu/nps/moves/dis7/PropulsionSystemData.java
@@ -147,7 +147,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -169,4 +169,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (engineRpm == rhs.engineRpm)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" powerSetting: ").append(powerSetting).append("\n");
+    sb.append(" engineRpm: ").append(engineRpm).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ProtocolMode.java b/src-generated/edu/nps/moves/dis7/ProtocolMode.java
index 2187fc3d0e..d04bff3b56 100644
--- a/src-generated/edu/nps/moves/dis7/ProtocolMode.java
+++ b/src-generated/edu/nps/moves/dis7/ProtocolMode.java
@@ -125,7 +125,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -146,4 +146,15 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (protocolMode == rhs.protocolMode)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" protocolMode: ").append(protocolMode).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RadioCommsHeader.java b/src-generated/edu/nps/moves/dis7/RadioCommsHeader.java
index c84b373ba1..23c09d649d 100644
--- a/src-generated/edu/nps/moves/dis7/RadioCommsHeader.java
+++ b/src-generated/edu/nps/moves/dis7/RadioCommsHeader.java
@@ -145,7 +145,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -167,4 +167,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (radioNumber == rhs.radioNumber)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" radioReferenceID: ").append(radioReferenceID).append("\n");
+    sb.append(" radioNumber: ").append(radioNumber).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RadioCommunicationsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/RadioCommunicationsFamilyPdu.java
index 9911310ae0..53b2f2486a 100644
--- a/src-generated/edu/nps/moves/dis7/RadioCommunicationsFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RadioCommunicationsFamilyPdu.java
@@ -111,7 +111,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -126,4 +126,14 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RadioIdentifier.java b/src-generated/edu/nps/moves/dis7/RadioIdentifier.java
index 1d5a651dea..e0d9e47c8f 100644
--- a/src-generated/edu/nps/moves/dis7/RadioIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/RadioIdentifier.java
@@ -191,7 +191,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -215,4 +215,18 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (radioNumber == rhs.radioNumber)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" siteNumber: ").append(siteNumber).append("\n");
+    sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
+    sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
+    sb.append(" radioNumber: ").append(radioNumber).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RadioType.java b/src-generated/edu/nps/moves/dis7/RadioType.java
index 6737100d5d..6141c94156 100644
--- a/src-generated/edu/nps/moves/dis7/RadioType.java
+++ b/src-generated/edu/nps/moves/dis7/RadioType.java
@@ -255,7 +255,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -282,4 +282,21 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (extra == rhs.extra)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" entityKind: ").append(entityKind).append("\n");
+    sb.append(" domain: ").append(domain).append("\n");
+    sb.append(" country: ").append(country).append("\n");
+    sb.append(" category: ").append(category).append("\n");
+    sb.append(" subcategory: ").append(subcategory).append("\n");
+    sb.append(" specific: ").append(specific).append("\n");
+    sb.append(" extra: ").append(extra).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ReceiverPdu.java b/src-generated/edu/nps/moves/dis7/ReceiverPdu.java
index a8684587b6..464e9668e2 100644
--- a/src-generated/edu/nps/moves/dis7/ReceiverPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ReceiverPdu.java
@@ -239,7 +239,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -260,4 +260,20 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (transmitterRadioId == rhs.transmitterRadioId)) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" header: ").append(header).append("\n");
+    sb.append(" receiverState: ").append(receiverState).append("\n");
+    sb.append(" padding1: ").append(padding1).append("\n");
+    sb.append(" receivedPower: ").append(receivedPower).append("\n");
+    sb.append(" transmitterEntityId: ").append(transmitterEntityId).append("\n");
+    sb.append(" transmitterRadioId: ").append(transmitterRadioId).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java b/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java
index 4106e6306c..beaf83f504 100644
--- a/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java
@@ -279,7 +279,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -303,4 +303,21 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" requestID: ").append(requestID).append("\n");
+    sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
+    sb.append(" pad1: ").append(pad1).append("\n");
+    sb.append(" eventType: ").append(eventType).append("\n");
+    sb.append(" time: ").append(time).append("\n");
+    sb.append(" recordIDs: ").append("\n");
+    recordIDs.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RecordQuerySpecification.java b/src-generated/edu/nps/moves/dis7/RecordQuerySpecification.java
index a945b34e17..393defaabf 100644
--- a/src-generated/edu/nps/moves/dis7/RecordQuerySpecification.java
+++ b/src-generated/edu/nps/moves/dis7/RecordQuerySpecification.java
@@ -159,7 +159,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -183,4 +183,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" recordIDs: ").append("\n");
+    recordIDs.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RecordRPdu.java b/src-generated/edu/nps/moves/dis7/RecordRPdu.java
index 007fd50a3d..7d5d199163 100644
--- a/src-generated/edu/nps/moves/dis7/RecordRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RecordRPdu.java
@@ -256,7 +256,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -279,4 +279,20 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" requestID: ").append(requestID).append("\n");
+    sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
+    sb.append(" pad1: ").append(pad1).append("\n");
+    sb.append(" eventType: ").append(eventType).append("\n");
+    sb.append(" recordSets: ").append("\n");
+    recordSets.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RecordSpecification.java b/src-generated/edu/nps/moves/dis7/RecordSpecification.java
index ca678e2f98..824c431a1d 100644
--- a/src-generated/edu/nps/moves/dis7/RecordSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/RecordSpecification.java
@@ -161,7 +161,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -185,4 +185,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" recordSets: ").append("\n");
+    recordSets.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RecordSpecificationElement.java b/src-generated/edu/nps/moves/dis7/RecordSpecificationElement.java
index f63e71389e..025cbd78a9 100644
--- a/src-generated/edu/nps/moves/dis7/RecordSpecificationElement.java
+++ b/src-generated/edu/nps/moves/dis7/RecordSpecificationElement.java
@@ -272,7 +272,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -309,4 +309,23 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" recordID: ").append(recordID).append("\n");
+    sb.append(" recordSetSerialNumber: ").append(recordSetSerialNumber).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+    sb.append(" recordLength: ").append(recordLength).append("\n");
+    sb.append(" recordCount: ").append(recordCount).append("\n");
+    sb.append(" recordValues: ").append("\n");
+    sb.append(Arrays.toString(recordValues)).append("\n");
+    sb.append(" padTo64: ").append("\n");
+    sb.append(Arrays.toString(padTo64)).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Relationship.java b/src-generated/edu/nps/moves/dis7/Relationship.java
index f76bafb9fd..9a4579a6c7 100644
--- a/src-generated/edu/nps/moves/dis7/Relationship.java
+++ b/src-generated/edu/nps/moves/dis7/Relationship.java
@@ -147,7 +147,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -169,4 +169,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (position == rhs.position)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" nature: ").append(nature).append("\n");
+    sb.append(" position: ").append(position).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RemoveEntityPdu.java b/src-generated/edu/nps/moves/dis7/RemoveEntityPdu.java
index b41ffee477..ffac50da10 100644
--- a/src-generated/edu/nps/moves/dis7/RemoveEntityPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RemoveEntityPdu.java
@@ -133,7 +133,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -149,4 +149,15 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (requestID == rhs.requestID)) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" requestID: ").append(requestID).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java b/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java
index 4c19212cea..b25771a4d2 100644
--- a/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java
@@ -197,7 +197,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -216,4 +216,18 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (requestID == rhs.requestID)) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
+    sb.append(" pad1: ").append(pad1).append("\n");
+    sb.append(" pad2: ").append(pad2).append("\n");
+    sb.append(" requestID: ").append(requestID).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RepairCompletePdu.java b/src-generated/edu/nps/moves/dis7/RepairCompletePdu.java
index 51ed130a90..0609dc069b 100644
--- a/src-generated/edu/nps/moves/dis7/RepairCompletePdu.java
+++ b/src-generated/edu/nps/moves/dis7/RepairCompletePdu.java
@@ -197,7 +197,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -216,4 +216,18 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (padding4 == rhs.padding4)) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
+    sb.append(" repairingEntityID: ").append(repairingEntityID).append("\n");
+    sb.append(" repair: ").append(repair).append("\n");
+    sb.append(" padding4: ").append(padding4).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RepairResponsePdu.java b/src-generated/edu/nps/moves/dis7/RepairResponsePdu.java
index 21ce571c8e..5a6fce116f 100644
--- a/src-generated/edu/nps/moves/dis7/RepairResponsePdu.java
+++ b/src-generated/edu/nps/moves/dis7/RepairResponsePdu.java
@@ -219,7 +219,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -239,4 +239,19 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
+    sb.append(" repairingEntityID: ").append(repairingEntityID).append("\n");
+    sb.append(" repairResult: ").append(repairResult).append("\n");
+    sb.append(" padding1: ").append(padding1).append("\n");
+    sb.append(" padding2: ").append(padding2).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RequestID.java b/src-generated/edu/nps/moves/dis7/RequestID.java
index 5b1fe7353a..723e985784 100644
--- a/src-generated/edu/nps/moves/dis7/RequestID.java
+++ b/src-generated/edu/nps/moves/dis7/RequestID.java
@@ -125,7 +125,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -146,4 +146,15 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (requestID == rhs.requestID)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" requestID: ").append(requestID).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ResupplyCancelPdu.java b/src-generated/edu/nps/moves/dis7/ResupplyCancelPdu.java
index 1f07b38310..66a616e3dc 100644
--- a/src-generated/edu/nps/moves/dis7/ResupplyCancelPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ResupplyCancelPdu.java
@@ -153,7 +153,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -170,4 +170,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (supplyingEntityID.equals( rhs.supplyingEntityID) )) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
+    sb.append(" supplyingEntityID: ").append(supplyingEntityID).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ResupplyOfferPdu.java b/src-generated/edu/nps/moves/dis7/ResupplyOfferPdu.java
index 2566b6f0e0..e9d169ed38 100644
--- a/src-generated/edu/nps/moves/dis7/ResupplyOfferPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ResupplyOfferPdu.java
@@ -255,7 +255,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -278,4 +278,20 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
+    sb.append(" supplyingEntityID: ").append(supplyingEntityID).append("\n");
+    sb.append(" padding1: ").append(padding1).append("\n");
+    sb.append(" padding2: ").append(padding2).append("\n");
+    sb.append(" supplies: ").append("\n");
+    supplies.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ResupplyReceivedPdu.java b/src-generated/edu/nps/moves/dis7/ResupplyReceivedPdu.java
index fd991f74ab..7cec521bc2 100644
--- a/src-generated/edu/nps/moves/dis7/ResupplyReceivedPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ResupplyReceivedPdu.java
@@ -255,7 +255,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -278,4 +278,20 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
+    sb.append(" supplyingEntityID: ").append(supplyingEntityID).append("\n");
+    sb.append(" padding1: ").append(padding1).append("\n");
+    sb.append(" padding2: ").append(padding2).append("\n");
+    sb.append(" supplies: ").append("\n");
+    supplies.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SEESPdu.java b/src-generated/edu/nps/moves/dis7/SEESPdu.java
index d692d45435..2f77334ffe 100644
--- a/src-generated/edu/nps/moves/dis7/SEESPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SEESPdu.java
@@ -314,7 +314,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -341,4 +341,22 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" orginatingEntityID: ").append(orginatingEntityID).append("\n");
+    sb.append(" infraredSignatureRepresentationIndex: ").append(infraredSignatureRepresentationIndex).append("\n");
+    sb.append(" acousticSignatureRepresentationIndex: ").append(acousticSignatureRepresentationIndex).append("\n");
+    sb.append(" radarCrossSectionSignatureRepresentationIndex: ").append(radarCrossSectionSignatureRepresentationIndex).append("\n");
+    sb.append(" propulsionSystemData: ").append("\n");
+    propulsionSystemData.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" vectoringSystemData: ").append("\n");
+    vectoringSystemData.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SecondaryOperationalData.java b/src-generated/edu/nps/moves/dis7/SecondaryOperationalData.java
index d928f88e9a..45742cb8e9 100644
--- a/src-generated/edu/nps/moves/dis7/SecondaryOperationalData.java
+++ b/src-generated/edu/nps/moves/dis7/SecondaryOperationalData.java
@@ -169,7 +169,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -192,4 +192,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (numberOfIFFFundamentalParameterRecords == rhs.numberOfIFFFundamentalParameterRecords)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" operationalData1: ").append(operationalData1).append("\n");
+    sb.append(" operationalData2: ").append(operationalData2).append("\n");
+    sb.append(" numberOfIFFFundamentalParameterRecords: ").append(numberOfIFFFundamentalParameterRecords).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Sensor.java b/src-generated/edu/nps/moves/dis7/Sensor.java
index 76f14aa2e5..217c665fd0 100644
--- a/src-generated/edu/nps/moves/dis7/Sensor.java
+++ b/src-generated/edu/nps/moves/dis7/Sensor.java
@@ -235,7 +235,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -261,4 +261,20 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (padding == rhs.padding)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" sensorTypeSource: ").append(sensorTypeSource).append("\n");
+    sb.append(" sensorOnOffStatus: ").append(sensorOnOffStatus).append("\n");
+    sb.append(" sensorType: ").append(sensorType).append("\n");
+    sb.append(" station: ").append(station).append("\n");
+    sb.append(" quantity: ").append(quantity).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SeparationVP.java b/src-generated/edu/nps/moves/dis7/SeparationVP.java
index f0e4a32f13..7209de3b81 100644
--- a/src-generated/edu/nps/moves/dis7/SeparationVP.java
+++ b/src-generated/edu/nps/moves/dis7/SeparationVP.java
@@ -255,7 +255,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -282,4 +282,21 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (stationLocation.equals( rhs.stationLocation) )) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" recordType: ").append(recordType).append("\n");
+    sb.append(" reasonForSeparation: ").append(reasonForSeparation).append("\n");
+    sb.append(" preEntityIndicator: ").append(preEntityIndicator).append("\n");
+    sb.append(" padding1: ").append(padding1).append("\n");
+    sb.append(" parentEntityID: ").append(parentEntityID).append("\n");
+    sb.append(" padding2: ").append(padding2).append("\n");
+    sb.append(" stationLocation: ").append(stationLocation).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ServiceRequestPdu.java b/src-generated/edu/nps/moves/dis7/ServiceRequestPdu.java
index 1a3b1986c4..f51d6585d9 100644
--- a/src-generated/edu/nps/moves/dis7/ServiceRequestPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ServiceRequestPdu.java
@@ -253,7 +253,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -276,4 +276,20 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
+    sb.append(" servicingEntityID: ").append(servicingEntityID).append("\n");
+    sb.append(" serviceTypeRequested: ").append(serviceTypeRequested).append("\n");
+    sb.append(" padding1: ").append(padding1).append("\n");
+    sb.append(" supplies: ").append("\n");
+    supplies.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SetDataPdu.java b/src-generated/edu/nps/moves/dis7/SetDataPdu.java
index 6817d1aac1..7312e9b436 100644
--- a/src-generated/edu/nps/moves/dis7/SetDataPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SetDataPdu.java
@@ -271,7 +271,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -296,4 +296,20 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" requestID: ").append(requestID).append("\n");
+    sb.append(" padding1: ").append(padding1).append("\n");
+    sb.append(" fixedDatums: ").append("\n");
+    fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" variableDatums: ").append("\n");
+    variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SetDataRPdu.java b/src-generated/edu/nps/moves/dis7/SetDataRPdu.java
index 956a186b55..d799710573 100644
--- a/src-generated/edu/nps/moves/dis7/SetDataRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SetDataRPdu.java
@@ -315,7 +315,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -342,4 +342,22 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
+    sb.append(" pad1: ").append(pad1).append("\n");
+    sb.append(" pad2: ").append(pad2).append("\n");
+    sb.append(" requestID: ").append(requestID).append("\n");
+    sb.append(" fixedDatumRecords: ").append("\n");
+    fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" variableDatumRecords: ").append("\n");
+    variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java b/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java
index 488ea86e79..9a39eb0f75 100644
--- a/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java
@@ -276,7 +276,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -300,4 +300,21 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" requestID: ").append(requestID).append("\n");
+    sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
+    sb.append(" pad1: ").append(pad1).append("\n");
+    sb.append(" pad2: ").append(pad2).append("\n");
+    sb.append(" pad3: ").append(pad3).append("\n");
+    sb.append(" recordSets: ").append("\n");
+    recordSets.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ShaftRPM.java b/src-generated/edu/nps/moves/dis7/ShaftRPM.java
index a3654f52a4..ace618c8c8 100644
--- a/src-generated/edu/nps/moves/dis7/ShaftRPM.java
+++ b/src-generated/edu/nps/moves/dis7/ShaftRPM.java
@@ -165,7 +165,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -188,4 +188,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (RPMrateOfChange == rhs.RPMrateOfChange)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" currentRPM: ").append(currentRPM).append("\n");
+    sb.append(" orderedRPM: ").append(orderedRPM).append("\n");
+    sb.append(" RPMrateOfChange: ").append(RPMrateOfChange).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SilentEntitySystem.java b/src-generated/edu/nps/moves/dis7/SilentEntitySystem.java
index 6c7d6646ca..d078593559 100644
--- a/src-generated/edu/nps/moves/dis7/SilentEntitySystem.java
+++ b/src-generated/edu/nps/moves/dis7/SilentEntitySystem.java
@@ -185,7 +185,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -213,4 +213,18 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" numberOfEntities: ").append(numberOfEntities).append("\n");
+    sb.append(" entityType: ").append(entityType).append("\n");
+    sb.append(" appearanceRecordList: ").append("\n");
+    sb.append(Arrays.toString(appearanceRecordList)).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SimulationAddress.java b/src-generated/edu/nps/moves/dis7/SimulationAddress.java
index 7c2cf3e560..8bb920d8d8 100644
--- a/src-generated/edu/nps/moves/dis7/SimulationAddress.java
+++ b/src-generated/edu/nps/moves/dis7/SimulationAddress.java
@@ -147,7 +147,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -169,4 +169,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (application == rhs.application)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" site: ").append(site).append("\n");
+    sb.append(" application: ").append(application).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SimulationIdentifier.java b/src-generated/edu/nps/moves/dis7/SimulationIdentifier.java
index e037f98bbc..afb6aa3e61 100644
--- a/src-generated/edu/nps/moves/dis7/SimulationIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/SimulationIdentifier.java
@@ -146,7 +146,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -168,4 +168,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (referenceNumber == rhs.referenceNumber)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
+    sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SimulationManagementFamilyPdu.java b/src-generated/edu/nps/moves/dis7/SimulationManagementFamilyPdu.java
index 10e547b80b..19f70e1d7f 100644
--- a/src-generated/edu/nps/moves/dis7/SimulationManagementFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SimulationManagementFamilyPdu.java
@@ -153,7 +153,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -170,4 +170,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (receivingID.equals( rhs.receivingID) )) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" originatingID: ").append(originatingID).append("\n");
+    sb.append(" receivingID: ").append(receivingID).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SimulationManagementWithReliabilityFamilyPdu.java b/src-generated/edu/nps/moves/dis7/SimulationManagementWithReliabilityFamilyPdu.java
index 5c8e628e98..649c7eca10 100644
--- a/src-generated/edu/nps/moves/dis7/SimulationManagementWithReliabilityFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SimulationManagementWithReliabilityFamilyPdu.java
@@ -152,7 +152,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -169,4 +169,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (receivingID.equals( rhs.receivingID) )) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" originatingID: ").append(originatingID).append("\n");
+    sb.append(" receivingID: ").append(receivingID).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StandardVariableRecord.java b/src-generated/edu/nps/moves/dis7/StandardVariableRecord.java
index 88e6f78a8f..a595987fb3 100644
--- a/src-generated/edu/nps/moves/dis7/StandardVariableRecord.java
+++ b/src-generated/edu/nps/moves/dis7/StandardVariableRecord.java
@@ -170,7 +170,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -197,4 +197,18 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" recordType: ").append(recordType).append("\n");
+    sb.append(" recordSpecificFields: ").append("\n");
+    sb.append(Arrays.toString(recordSpecificFields)).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StandardVariableSpecification.java b/src-generated/edu/nps/moves/dis7/StandardVariableSpecification.java
index 46d8a06f3d..30960eda52 100644
--- a/src-generated/edu/nps/moves/dis7/StandardVariableSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/StandardVariableSpecification.java
@@ -176,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -201,4 +201,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" numberOfStandardVariableRecords: ").append(numberOfStandardVariableRecords).append("\n");
+    sb.append(" standardVariables: ").append("\n");
+    standardVariables.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StartResumePdu.java b/src-generated/edu/nps/moves/dis7/StartResumePdu.java
index ac448e5600..225fe9e94a 100644
--- a/src-generated/edu/nps/moves/dis7/StartResumePdu.java
+++ b/src-generated/edu/nps/moves/dis7/StartResumePdu.java
@@ -175,7 +175,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -193,4 +193,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (requestID == rhs.requestID)) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
+    sb.append(" simulationTime: ").append(simulationTime).append("\n");
+    sb.append(" requestID: ").append(requestID).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java b/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java
index c083bddcbf..3c86bd0132 100644
--- a/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java
@@ -239,7 +239,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -260,4 +260,20 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (requestID == rhs.requestID)) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
+    sb.append(" simulationTime: ").append(simulationTime).append("\n");
+    sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
+    sb.append(" pad1: ").append(pad1).append("\n");
+    sb.append(" pad2: ").append(pad2).append("\n");
+    sb.append(" requestID: ").append(requestID).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StopFreezePdu.java b/src-generated/edu/nps/moves/dis7/StopFreezePdu.java
index a43448d678..c317b80c1b 100644
--- a/src-generated/edu/nps/moves/dis7/StopFreezePdu.java
+++ b/src-generated/edu/nps/moves/dis7/StopFreezePdu.java
@@ -219,7 +219,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -234,8 +234,24 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
      if( ! (realWorldTime.equals( rhs.realWorldTime) )) ivarsEqual = false;
      if( ! (reason == rhs.reason)) ivarsEqual = false;
+     if( ! (frozenBehavior.equals( rhs.frozenBehavior) )) ivarsEqual = false;
      if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
      if( ! (requestID == rhs.requestID)) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
+    sb.append(" reason: ").append(reason).append("\n");
+    sb.append(" frozenBehavior: ").append(frozenBehavior).append("\n");
+    sb.append(" padding1: ").append(padding1).append("\n");
+    sb.append(" requestID: ").append(requestID).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java b/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java
index 6f9dde209e..08fc6f90a0 100644
--- a/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java
@@ -241,7 +241,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -256,9 +256,26 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
      if( ! (realWorldTime.equals( rhs.realWorldTime) )) ivarsEqual = false;
      if( ! (reason == rhs.reason)) ivarsEqual = false;
+     if( ! (frozenBehavior.equals( rhs.frozenBehavior) )) ivarsEqual = false;
      if( ! (requiredReliablityService == rhs.requiredReliablityService)) ivarsEqual = false;
      if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
      if( ! (requestID == rhs.requestID)) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
+    sb.append(" reason: ").append(reason).append("\n");
+    sb.append(" frozenBehavior: ").append(frozenBehavior).append("\n");
+    sb.append(" requiredReliablityService: ").append(requiredReliablityService).append("\n");
+    sb.append(" pad1: ").append(pad1).append("\n");
+    sb.append(" requestID: ").append(requestID).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StorageFuel.java b/src-generated/edu/nps/moves/dis7/StorageFuel.java
index 0c7bc6de1d..1785a6bf70 100644
--- a/src-generated/edu/nps/moves/dis7/StorageFuel.java
+++ b/src-generated/edu/nps/moves/dis7/StorageFuel.java
@@ -213,7 +213,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -238,4 +238,19 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (padding == rhs.padding)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" fuelQuantity: ").append(fuelQuantity).append("\n");
+    sb.append(" fuelMeasurementUnits: ").append(fuelMeasurementUnits).append("\n");
+    sb.append(" fuelType: ").append(fuelType).append("\n");
+    sb.append(" fuelLocation: ").append(fuelLocation).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StorageFuelReload.java b/src-generated/edu/nps/moves/dis7/StorageFuelReload.java
index 2f340d00a4..b70acf21f8 100644
--- a/src-generated/edu/nps/moves/dis7/StorageFuelReload.java
+++ b/src-generated/edu/nps/moves/dis7/StorageFuelReload.java
@@ -279,7 +279,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -307,4 +307,22 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (padding == rhs.padding)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" standardQuantity: ").append(standardQuantity).append("\n");
+    sb.append(" maximumQuantity: ").append(maximumQuantity).append("\n");
+    sb.append(" standardQuantityReloadTime: ").append(standardQuantityReloadTime).append("\n");
+    sb.append(" maximumQuantityReloadTime: ").append(maximumQuantityReloadTime).append("\n");
+    sb.append(" fuelMeasurementUnits: ").append(fuelMeasurementUnits).append("\n");
+    sb.append(" fuelType: ").append(fuelType).append("\n");
+    sb.append(" fuelLocation: ").append(fuelLocation).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SupplyQuantity.java b/src-generated/edu/nps/moves/dis7/SupplyQuantity.java
index 354b74d044..511a577bf8 100644
--- a/src-generated/edu/nps/moves/dis7/SupplyQuantity.java
+++ b/src-generated/edu/nps/moves/dis7/SupplyQuantity.java
@@ -146,7 +146,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -168,4 +168,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (quantity == rhs.quantity)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" supplyType: ").append(supplyType).append("\n");
+    sb.append(" quantity: ").append(quantity).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SyntheticEnvironmentFamilyPdu.java b/src-generated/edu/nps/moves/dis7/SyntheticEnvironmentFamilyPdu.java
index 55a5b476dc..786a0be8a0 100644
--- a/src-generated/edu/nps/moves/dis7/SyntheticEnvironmentFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SyntheticEnvironmentFamilyPdu.java
@@ -111,7 +111,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -126,4 +126,14 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SystemIdentifier.java b/src-generated/edu/nps/moves/dis7/SystemIdentifier.java
index e44a487c42..30af33a38b 100644
--- a/src-generated/edu/nps/moves/dis7/SystemIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/SystemIdentifier.java
@@ -190,7 +190,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -214,4 +214,18 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (changeOptions.equals( rhs.changeOptions) )) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" systemType: ").append(systemType).append("\n");
+    sb.append(" systemName: ").append(systemName).append("\n");
+    sb.append(" systemMode: ").append(systemMode).append("\n");
+    sb.append(" changeOptions: ").append(changeOptions).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/TSPIPdu.java b/src-generated/edu/nps/moves/dis7/TSPIPdu.java
index 129796e3c5..d85be41910 100644
--- a/src-generated/edu/nps/moves/dis7/TSPIPdu.java
+++ b/src-generated/edu/nps/moves/dis7/TSPIPdu.java
@@ -331,7 +331,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -361,4 +361,25 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" liveEntityId: ").append(liveEntityId).append("\n");
+    sb.append(" TSPIFlag: ").append(TSPIFlag).append("\n");
+    sb.append(" entityLocation: ").append(entityLocation).append("\n");
+    sb.append(" entityLinearVelocity: ").append(entityLinearVelocity).append("\n");
+    sb.append(" entityOrientation: ").append(entityOrientation).append("\n");
+    sb.append(" positionError: ").append(positionError).append("\n");
+    sb.append(" orientationError: ").append(orientationError).append("\n");
+    sb.append(" deadReckoningParameters: ").append(deadReckoningParameters).append("\n");
+    sb.append(" measuredSpeed: ").append(measuredSpeed).append("\n");
+    sb.append(" systemSpecificData: ").append("\n");
+    sb.append(Arrays.toString(systemSpecificData)).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/TotalRecordSets.java b/src-generated/edu/nps/moves/dis7/TotalRecordSets.java
index 0be7db4db0..3cd55bf59d 100644
--- a/src-generated/edu/nps/moves/dis7/TotalRecordSets.java
+++ b/src-generated/edu/nps/moves/dis7/TotalRecordSets.java
@@ -147,7 +147,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -169,4 +169,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (padding == rhs.padding)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" totalRecordSets: ").append(totalRecordSets).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/TrackJamData.java b/src-generated/edu/nps/moves/dis7/TrackJamData.java
index d55cc8ee81..a2af1b89af 100644
--- a/src-generated/edu/nps/moves/dis7/TrackJamData.java
+++ b/src-generated/edu/nps/moves/dis7/TrackJamData.java
@@ -168,7 +168,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -191,4 +191,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (beamNumber == rhs.beamNumber)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" entityID: ").append(entityID).append("\n");
+    sb.append(" emitterNumber: ").append(emitterNumber).append("\n");
+    sb.append(" beamNumber: ").append(beamNumber).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/TransferOwnershipPdu.java b/src-generated/edu/nps/moves/dis7/TransferOwnershipPdu.java
index 8aa1ee72ef..bbcfdf795b 100644
--- a/src-generated/edu/nps/moves/dis7/TransferOwnershipPdu.java
+++ b/src-generated/edu/nps/moves/dis7/TransferOwnershipPdu.java
@@ -260,7 +260,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -282,4 +282,21 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (recordSets.equals( rhs.recordSets) )) ivarsEqual = false;
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" originatingEntityID: ").append(originatingEntityID).append("\n");
+    sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
+    sb.append(" requestID: ").append(requestID).append("\n");
+    sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
+    sb.append(" transferType: ").append(transferType).append("\n");
+    sb.append(" transferEntityID: ").append(transferEntityID).append("\n");
+    sb.append(" recordSets: ").append(recordSets).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/TransmitterPdu.java b/src-generated/edu/nps/moves/dis7/TransmitterPdu.java
index 3c8ce55e8d..42c3fa2be4 100644
--- a/src-generated/edu/nps/moves/dis7/TransmitterPdu.java
+++ b/src-generated/edu/nps/moves/dis7/TransmitterPdu.java
@@ -593,7 +593,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -633,4 +633,35 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" header: ").append(header).append("\n");
+    sb.append(" radioNumber: ").append(radioNumber).append("\n");
+    sb.append(" radioEntityType: ").append(radioEntityType).append("\n");
+    sb.append(" transmitState: ").append(transmitState).append("\n");
+    sb.append(" inputSource: ").append(inputSource).append("\n");
+    sb.append(" variableTransmitterParameterCount: ").append(variableTransmitterParameterCount).append("\n");
+    sb.append(" antennaLocation: ").append(antennaLocation).append("\n");
+    sb.append(" relativeAntennaLocation: ").append(relativeAntennaLocation).append("\n");
+    sb.append(" antennaPatternType: ").append(antennaPatternType).append("\n");
+    sb.append(" frequency: ").append(frequency).append("\n");
+    sb.append(" transmitFrequencyBandwidth: ").append(transmitFrequencyBandwidth).append("\n");
+    sb.append(" power: ").append(power).append("\n");
+    sb.append(" modulationType: ").append(modulationType).append("\n");
+    sb.append(" cryptoSystem: ").append(cryptoSystem).append("\n");
+    sb.append(" cryptoKeyId: ").append(cryptoKeyId).append("\n");
+    sb.append(" padding1: ").append(padding1).append("\n");
+    sb.append(" padding2: ").append(padding2).append("\n");
+    sb.append(" modulationParametersList: ").append("\n");
+    modulationParametersList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" antennaPatternList: ").append("\n");
+    antennaPatternList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/UABeam.java b/src-generated/edu/nps/moves/dis7/UABeam.java
index 4978762509..30e5059f22 100644
--- a/src-generated/edu/nps/moves/dis7/UABeam.java
+++ b/src-generated/edu/nps/moves/dis7/UABeam.java
@@ -185,7 +185,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -209,4 +209,18 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (fundamentalParameterData.equals( rhs.fundamentalParameterData) )) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" beamDataLength: ").append(beamDataLength).append("\n");
+    sb.append(" beamNumber: ").append(beamNumber).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+    sb.append(" fundamentalParameterData: ").append(fundamentalParameterData).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/UAEmitter.java b/src-generated/edu/nps/moves/dis7/UAEmitter.java
index d835976fff..b1372dad12 100644
--- a/src-generated/edu/nps/moves/dis7/UAEmitter.java
+++ b/src-generated/edu/nps/moves/dis7/UAEmitter.java
@@ -245,7 +245,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -273,4 +273,20 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" systemDataLength: ").append(systemDataLength).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+    sb.append(" acousticEmitter: ").append(acousticEmitter).append("\n");
+    sb.append(" location: ").append(location).append("\n");
+    sb.append(" beams: ").append("\n");
+    beams.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/UAFundamentalParameter.java b/src-generated/edu/nps/moves/dis7/UAFundamentalParameter.java
index 1b46ce4ae5..a8887776a9 100644
--- a/src-generated/edu/nps/moves/dis7/UAFundamentalParameter.java
+++ b/src-generated/edu/nps/moves/dis7/UAFundamentalParameter.java
@@ -235,7 +235,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -261,4 +261,20 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (depressionElevationBeamWidth == rhs.depressionElevationBeamWidth)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" activeEmissionParameterIndex: ").append(activeEmissionParameterIndex).append("\n");
+    sb.append(" scanPattern: ").append(scanPattern).append("\n");
+    sb.append(" beamCenterAzimuthHorizontal: ").append(beamCenterAzimuthHorizontal).append("\n");
+    sb.append(" azimuthalBeamwidthHorizontal: ").append(azimuthalBeamwidthHorizontal).append("\n");
+    sb.append(" beamCenterDepressionElevation: ").append(beamCenterDepressionElevation).append("\n");
+    sb.append(" depressionElevationBeamWidth: ").append(depressionElevationBeamWidth).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/UnattachedIdentifier.java b/src-generated/edu/nps/moves/dis7/UnattachedIdentifier.java
index 565d436e57..af25d38513 100644
--- a/src-generated/edu/nps/moves/dis7/UnattachedIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/UnattachedIdentifier.java
@@ -146,7 +146,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -168,4 +168,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (referenceNumber == rhs.referenceNumber)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
+    sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/UnderwaterAcousticPdu.java b/src-generated/edu/nps/moves/dis7/UnderwaterAcousticPdu.java
index f2b8a99bec..83d2193548 100644
--- a/src-generated/edu/nps/moves/dis7/UnderwaterAcousticPdu.java
+++ b/src-generated/edu/nps/moves/dis7/UnderwaterAcousticPdu.java
@@ -414,7 +414,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -447,4 +447,26 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" emittingEntityID: ").append(emittingEntityID).append("\n");
+    sb.append(" eventID: ").append(eventID).append("\n");
+    sb.append(" stateChangeIndicator: ").append(stateChangeIndicator).append("\n");
+    sb.append(" pad: ").append(pad).append("\n");
+    sb.append(" passiveParameterIndex: ").append(passiveParameterIndex).append("\n");
+    sb.append(" propulsionPlantConfiguration: ").append(propulsionPlantConfiguration).append("\n");
+    sb.append(" shaftRPMs: ").append("\n");
+    shaftRPMs.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" apaData: ").append("\n");
+    apaData.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+    sb.append(" emitterSystems: ").append("\n");
+    emitterSystems.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/UnsignedDISInteger.java b/src-generated/edu/nps/moves/dis7/UnsignedDISInteger.java
index 15e028e517..385da035e7 100644
--- a/src-generated/edu/nps/moves/dis7/UnsignedDISInteger.java
+++ b/src-generated/edu/nps/moves/dis7/UnsignedDISInteger.java
@@ -125,7 +125,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -146,4 +146,15 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (val == rhs.val)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" val: ").append(val).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/VariableDatum.java b/src-generated/edu/nps/moves/dis7/VariableDatum.java
index bcd0952b81..4fabe42812 100644
--- a/src-generated/edu/nps/moves/dis7/VariableDatum.java
+++ b/src-generated/edu/nps/moves/dis7/VariableDatum.java
@@ -72,16 +72,32 @@ public class VariableDatum extends Object implements Serializable
    * Setter for {@link VariableDatum#variableDatumLength}
    * <p>
    * This value is the size IN BITS of the {@link VariableDatum#variableDatumValue} field. Since that field
-   * is a byte array, its size must be large enough to contain the specified number of bits. If this size is NOT
-   * set and this pdu is issued (marshaled), the value used for this field will be the size of the byte
-   * array times 8.
+   * is a byte array, its size must be large enough to contain the specified number of bits. If
+   * {@link VariableDatum#variableDatumValue} is NOT
+   * set and this pdu is issued (marshaled), the value used when marshaling this field will be
+   * the size of the byte array times 8.
    */
-  public VariableDatum setVariableDatumLength(int pVariableDatumLength)
+  public VariableDatum setVariableDatumLengthInBits(int bitLength)
   {
-    variableDatumLength = pVariableDatumLength;
+    variableDatumLength = bitLength;
     return this;
   }
 
+ /**
+   * Setter for {@link VariableDatum#variableDatumLength}
+   * <p>
+   * This value is the size in bytes of the {@link VariableDatum#variableDatumValue} field. Since that field
+   * is a byte array, its size must be large enough to contain the value specified here. If
+   * {@link VariableDatum#variableDatumValue} is NOT
+   * set and this pdu is issued (marshaled), the value used when marshaling this field will be
+   * the size of the byte array times 8.
+   */
+  public VariableDatum setVariableDatumLengthInBytes(int byteLength)
+  {
+    variableDatumLength = byteLength * Byte.SIZE;
+    return this;
+  }
+  
   /**
    * Getter for {@link VariableDatum#variableDatumLength}
    */
diff --git a/src-generated/edu/nps/moves/dis7/VariableParameter.java b/src-generated/edu/nps/moves/dis7/VariableParameter.java
index ed154d89bc..0deb2fb6bf 100644
--- a/src-generated/edu/nps/moves/dis7/VariableParameter.java
+++ b/src-generated/edu/nps/moves/dis7/VariableParameter.java
@@ -155,7 +155,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -182,4 +182,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" recordType: ").append(recordType).append("\n");
+    sb.append(" recordSpecificFields: ").append("\n");
+    sb.append(Arrays.toString(recordSpecificFields)).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/VariableTransmitterParameters.java b/src-generated/edu/nps/moves/dis7/VariableTransmitterParameters.java
index e06af319ef..c1e60ee472 100644
--- a/src-generated/edu/nps/moves/dis7/VariableTransmitterParameters.java
+++ b/src-generated/edu/nps/moves/dis7/VariableTransmitterParameters.java
@@ -184,7 +184,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -212,4 +212,19 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" recordType: ").append(recordType).append("\n");
+    sb.append(" recordLength: ").append(recordLength).append("\n");
+    sb.append(" recordSpecificFields: ").append("\n");
+    sb.append(Arrays.toString(recordSpecificFields)).append("\n");
+    sb.append(" padding: ").append(padding).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Vector2Float.java b/src-generated/edu/nps/moves/dis7/Vector2Float.java
index 0c61ab4133..e742a26225 100644
--- a/src-generated/edu/nps/moves/dis7/Vector2Float.java
+++ b/src-generated/edu/nps/moves/dis7/Vector2Float.java
@@ -147,7 +147,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -169,4 +169,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (y == rhs.y)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" x: ").append(x).append("\n");
+    sb.append(" y: ").append(y).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Vector3Double.java b/src-generated/edu/nps/moves/dis7/Vector3Double.java
index b4d48678ad..a707b66257 100644
--- a/src-generated/edu/nps/moves/dis7/Vector3Double.java
+++ b/src-generated/edu/nps/moves/dis7/Vector3Double.java
@@ -169,7 +169,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -192,4 +192,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (z == rhs.z)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" x: ").append(x).append("\n");
+    sb.append(" y: ").append(y).append("\n");
+    sb.append(" z: ").append(z).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Vector3Float.java b/src-generated/edu/nps/moves/dis7/Vector3Float.java
index d48b2470fd..7e3e67615f 100644
--- a/src-generated/edu/nps/moves/dis7/Vector3Float.java
+++ b/src-generated/edu/nps/moves/dis7/Vector3Float.java
@@ -169,7 +169,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -192,4 +192,17 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (z == rhs.z)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" x: ").append(x).append("\n");
+    sb.append(" y: ").append(y).append("\n");
+    sb.append(" z: ").append(z).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/VectoringNozzleSystem.java b/src-generated/edu/nps/moves/dis7/VectoringNozzleSystem.java
index 9bd9fdb07d..a742e5aa8e 100644
--- a/src-generated/edu/nps/moves/dis7/VectoringNozzleSystem.java
+++ b/src-generated/edu/nps/moves/dis7/VectoringNozzleSystem.java
@@ -147,7 +147,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -169,4 +169,16 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
      if( ! (verticalDeflectionAngle == rhs.verticalDeflectionAngle)) ivarsEqual = false;
     return ivarsEqual;
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+    sb.append(" horizontalDeflectionAngle: ").append(horizontalDeflectionAngle).append("\n");
+    sb.append(" verticalDeflectionAngle: ").append(verticalDeflectionAngle).append("\n");
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/WarfareFamilyPdu.java b/src-generated/edu/nps/moves/dis7/WarfareFamilyPdu.java
index f9a88fa84d..c88a687625 100644
--- a/src-generated/edu/nps/moves/dis7/WarfareFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/WarfareFamilyPdu.java
@@ -111,7 +111,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
     if(obj == null)
        return false;
 
-    if(getClass() != obj.getClass())
+    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
         return false;
 
     return equalsImpl(obj);
@@ -126,4 +126,14 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
 
     return ivarsEqual && super.equalsImpl(rhs);
  }
+
+ @Override
+ public String toString()
+ {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName()+":\n");
+
+
+   return sb.toString();
+ }
 } // end of class
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/APAParameterIndexAPAStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/APAParameterIndexAPAStatus.java
index d25a4d8dd0..9f1029c0b5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/APAParameterIndexAPAStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/APAParameterIndexAPAStatus.java
@@ -97,4 +97,10 @@ public enum APAParameterIndexAPAStatus
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "APAParameterIndexAPAStatus: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeAcknowledgeFlag.java b/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeAcknowledgeFlag.java
index b148f7f827..f22bb303ad 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeAcknowledgeFlag.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeAcknowledgeFlag.java
@@ -84,4 +84,10 @@ public enum AcknowledgeAcknowledgeFlag
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AcknowledgeAcknowledgeFlag: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeResponseFlag.java b/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeResponseFlag.java
index 6417687ec2..770184e9b3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeResponseFlag.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeResponseFlag.java
@@ -82,4 +82,10 @@ public enum AcknowledgeResponseFlag
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AcknowledgeResponseFlag: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Acronyms.java b/src-generated/edu/nps/moves/dis7/enumerations/Acronyms.java
index d0245c64c1..ddd4517530 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Acronyms.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Acronyms.java
@@ -706,4 +706,10 @@ public enum Acronyms
     {
         return description;
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Acronyms: " + name();
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ActionRequestActionID.java b/src-generated/edu/nps/moves/dis7/enumerations/ActionRequestActionID.java
index fac66d56ae..f30373b8b8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ActionRequestActionID.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ActionRequestActionID.java
@@ -172,4 +172,10 @@ public enum ActionRequestActionID
     {
         return 4; // 32 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ActionRequestActionID: " + name() + ": " + getValue();
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ActionResponseRequestStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/ActionResponseRequestStatus.java
index 7bb52df589..4caa6a00f2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ActionResponseRequestStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ActionResponseRequestStatus.java
@@ -102,4 +102,10 @@ public enum ActionResponseRequestStatus
     {
         return 4; // 32 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ActionResponseRequestStatus: " + name() + ": " + getValue();
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java b/src-generated/edu/nps/moves/dis7/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java
index 703a1c4a5b..df5242d1af 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java
@@ -103,4 +103,10 @@ public enum AddSpecificDimensionEnumerationsforSubsurfaceAreaSize
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AddSpecificDimensionEnumerationsforSubsurfaceAreaSize: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforAirCategory201Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforAirCategory201Insect.java
index cf9d6dffee..2609ca3d2f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforAirCategory201Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforAirCategory201Insect.java
@@ -95,4 +95,10 @@ public enum AddVariantsforAirCategory201Insect
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AddVariantsforAirCategory201Insect: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforLandCategory200Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforLandCategory200Mammal.java
index 3fa78d68ed..3fdf179106 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforLandCategory200Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforLandCategory200Mammal.java
@@ -101,4 +101,10 @@ public enum AddVariantsforLandCategory200Mammal
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AddVariantsforLandCategory200Mammal: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java
index 014e5c348a..c7fe41cbe7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java
@@ -105,4 +105,10 @@ public enum AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateKind.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateKind.java
index 443d402880..732b9e1f16 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateKind.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateKind.java
@@ -101,4 +101,10 @@ public enum AggregateStateAggregateKind
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AggregateStateAggregateKind: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateState.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateState.java
index 7ca3b9fcab..95aec001fd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateState.java
@@ -101,4 +101,10 @@ public enum AggregateStateAggregateState
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AggregateStateAggregateState: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateFormation.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateFormation.java
index 58585e4367..2943e07e98 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateFormation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateFormation.java
@@ -86,4 +86,10 @@ public enum AggregateStateFormation
     {
         return 4; // 32 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AggregateStateFormation: " + name() + ": " + getValue();
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSpecific.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSpecific.java
index 1fe6f72dac..0a8f49e112 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSpecific.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSpecific.java
@@ -93,4 +93,10 @@ public enum AggregateStateSpecific
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AggregateStateSpecific: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSubcategory.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSubcategory.java
index 121512516f..83f9e794b6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSubcategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSubcategory.java
@@ -135,4 +135,10 @@ public enum AggregateStateSubcategory implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AggregateStateSubcategory: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AirPlatformAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/AirPlatformAppearance.java
index 0ba9c73f47..e86b5943be 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AirPlatformAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AirPlatformAppearance.java
@@ -185,4 +185,10 @@ public class AirPlatformAppearance extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "AirPlatformAppearance: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AirPlatformCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/AirPlatformCapabilities.java
index 91707262c0..84b8844f1b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AirPlatformCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AirPlatformCapabilities.java
@@ -113,4 +113,10 @@ public class AirPlatformCapabilities extends DisBitSet implements EntityCapabili
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "AirPlatformCapabilities: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AircraftAddressSource.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftAddressSource.java
index e21c456e97..f1a5f76a98 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AircraftAddressSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftAddressSource.java
@@ -93,4 +93,10 @@ public enum AircraftAddressSource
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AircraftAddressSource: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AircraftIdentificationType.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftIdentificationType.java
index add60dc139..a6536b9d15 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AircraftIdentificationType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftIdentificationType.java
@@ -95,4 +95,10 @@ public enum AircraftIdentificationType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AircraftIdentificationType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AircraftPresentDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftPresentDomain.java
index e6e3bcb13e..3379372a69 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AircraftPresentDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftPresentDomain.java
@@ -95,4 +95,10 @@ public enum AircraftPresentDomain
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AircraftPresentDomain: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AircraftTypeWake.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftTypeWake.java
index 476407d37d..e0cadf4d9b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AircraftTypeWake.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftTypeWake.java
@@ -91,4 +91,10 @@ public enum AircraftTypeWake
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AircraftTypeWake: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java b/src-generated/edu/nps/moves/dis7/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java
index e6c21d8753..9f46f23b3e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java
@@ -119,4 +119,10 @@ public enum AnimalLifeformGroupSizeRangeEnumerationforallDomains
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AnimalLifeformGroupSizeRangeEnumerationforallDomains: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AntennaSelection.java b/src-generated/edu/nps/moves/dis7/enumerations/AntennaSelection.java
index bafea7ba52..a2f58b7799 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AntennaSelection.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AntennaSelection.java
@@ -97,4 +97,10 @@ public enum AntennaSelection
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AntennaSelection: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AntennaStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/AntennaStatus.java
index 089a00b379..0d74542c8b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AntennaStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AntennaStatus.java
@@ -95,4 +95,10 @@ public enum AntennaStatus
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AntennaStatus: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceAntiCollisionDayNight.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceAntiCollisionDayNight.java
index d849c3e4e4..833be08344 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceAntiCollisionDayNight.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceAntiCollisionDayNight.java
@@ -93,4 +93,10 @@ public enum AppearanceAntiCollisionDayNight
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceAntiCollisionDayNight: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCamouflageType.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCamouflageType.java
index 5135b7a922..25187334df 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCamouflageType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCamouflageType.java
@@ -97,4 +97,10 @@ public enum AppearanceCamouflageType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceCamouflageType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCanopy.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCanopy.java
index 4c45a5553e..00102d0926 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCanopy.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCanopy.java
@@ -103,4 +103,10 @@ public enum AppearanceCanopy
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceCanopy: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedMovement.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedMovement.java
index dee87ff38a..d04878ef60 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedMovement.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedMovement.java
@@ -93,4 +93,10 @@ public enum AppearanceConcealedMovement
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceConcealedMovement: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedPosition.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedPosition.java
index 65d1773e43..b761a8ce63 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedPosition.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedPosition.java
@@ -93,4 +93,10 @@ public enum AppearanceConcealedPosition
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceConcealedPosition: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceDamage.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceDamage.java
index 33780aa035..aa380e21eb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceDamage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceDamage.java
@@ -97,4 +97,10 @@ public enum AppearanceDamage
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceDamage: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEntityorObjectState.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEntityorObjectState.java
index c913629a80..90e977dff9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEntityorObjectState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEntityorObjectState.java
@@ -93,4 +93,10 @@ public enum AppearanceEntityorObjectState
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceEntityorObjectState: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEnvironmentalDensity.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEnvironmentalDensity.java
index 249e00ed01..828f6287c9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEnvironmentalDensity.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEnvironmentalDensity.java
@@ -99,4 +99,10 @@ public enum AppearanceEnvironmentalDensity
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceEnvironmentalDensity: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceHatch.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceHatch.java
index 55cde9d862..e135afc7ed 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceHatch.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceHatch.java
@@ -101,4 +101,10 @@ public enum AppearanceHatch
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceHatch: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLauncherOperational.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLauncherOperational.java
index f9483ab201..6eb501cf45 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLauncherOperational.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLauncherOperational.java
@@ -93,4 +93,10 @@ public enum AppearanceLauncherOperational
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceLauncherOperational: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormComplianceStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormComplianceStatus.java
index 6ea78ea78a..1a42ce9677 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormComplianceStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormComplianceStatus.java
@@ -121,4 +121,10 @@ public enum AppearanceLifeFormComplianceStatus
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceLifeFormComplianceStatus: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormPosture.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormPosture.java
index 8e04153878..9ba12bb0d1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormPosture.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormPosture.java
@@ -121,4 +121,10 @@ public enum AppearanceLifeFormPosture
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceLifeFormPosture: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormWeaponImplement.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormWeaponImplement.java
index da6408abe3..714f206c02 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormWeaponImplement.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormWeaponImplement.java
@@ -97,4 +97,10 @@ public enum AppearanceLifeFormWeaponImplement
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceLifeFormWeaponImplement: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeformHealth.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeformHealth.java
index c5aa7f2d89..9cc357ff71 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeformHealth.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeformHealth.java
@@ -97,4 +97,10 @@ public enum AppearanceLifeformHealth
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceLifeformHealth: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectLaneMarkerVisible.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectLaneMarkerVisible.java
index cc12587842..d103095f37 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectLaneMarkerVisible.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectLaneMarkerVisible.java
@@ -95,4 +95,10 @@ public enum AppearanceLinearObjectLaneMarkerVisible
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceLinearObjectLaneMarkerVisible: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectTankDitchBreach.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectTankDitchBreach.java
index 7ebb8f7428..709977cb70 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectTankDitchBreach.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectTankDitchBreach.java
@@ -97,4 +97,10 @@ public enum AppearanceLinearObjectTankDitchBreach
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceLinearObjectTankDitchBreach: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNVGMode.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNVGMode.java
index d7a9250ed8..e2928c28e1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNVGMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNVGMode.java
@@ -93,4 +93,10 @@ public enum AppearanceNVGMode
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceNVGMode: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNavigationPositionBrightness.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNavigationPositionBrightness.java
index e73ad853f6..54831a99d6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNavigationPositionBrightness.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNavigationPositionBrightness.java
@@ -93,4 +93,10 @@ public enum AppearanceNavigationPositionBrightness
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceNavigationPositionBrightness: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralDamage.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralDamage.java
index 701128c887..202369ff6a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralDamage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralDamage.java
@@ -95,4 +95,10 @@ public enum AppearanceObjectGeneralDamage
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceObjectGeneralDamage: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralIEDPresent.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralIEDPresent.java
index c26973a1ae..ac59c3686a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralIEDPresent.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralIEDPresent.java
@@ -97,4 +97,10 @@ public enum AppearanceObjectGeneralIEDPresent
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceObjectGeneralIEDPresent: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralPredistributed.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralPredistributed.java
index 71e62cdc49..e170022247 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralPredistributed.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralPredistributed.java
@@ -93,4 +93,10 @@ public enum AppearanceObjectGeneralPredistributed
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceObjectGeneralPredistributed: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificBreachState.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificBreachState.java
index 5274ea8c8b..41f10dd9ac 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificBreachState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificBreachState.java
@@ -95,4 +95,10 @@ public enum AppearanceObjectSpecificBreachState
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceObjectSpecificBreachState: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificChemicalType.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificChemicalType.java
index 4d0f5ca7c2..e1ba1b03b1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificChemicalType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificChemicalType.java
@@ -97,4 +97,10 @@ public enum AppearanceObjectSpecificChemicalType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceObjectSpecificChemicalType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearancePaintScheme.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearancePaintScheme.java
index 25677627dc..7847b3786c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearancePaintScheme.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearancePaintScheme.java
@@ -93,4 +93,10 @@ public enum AppearancePaintScheme
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearancePaintScheme: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSubsurfaceHatch.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSubsurfaceHatch.java
index d56df5e014..27c3c866d0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSubsurfaceHatch.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSubsurfaceHatch.java
@@ -95,4 +95,10 @@ public enum AppearanceSubsurfaceHatch
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceSubsurfaceHatch: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSupplyDeployed.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSupplyDeployed.java
index 51f61a18a4..34ba698763 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSupplyDeployed.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSupplyDeployed.java
@@ -97,4 +97,10 @@ public enum AppearanceSupplyDeployed
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceSupplyDeployed: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceTrailingEffects.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceTrailingEffects.java
index fe4a063adb..073e7425f5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceTrailingEffects.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceTrailingEffects.java
@@ -97,4 +97,10 @@ public enum AppearanceTrailingEffects
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AppearanceTrailingEffects: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ArealObjectAppearanceMinefield.java b/src-generated/edu/nps/moves/dis7/enumerations/ArealObjectAppearanceMinefield.java
index 3dce382725..a024109aee 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ArealObjectAppearanceMinefield.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ArealObjectAppearanceMinefield.java
@@ -81,4 +81,10 @@ public class ArealObjectAppearanceMinefield extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "ArealObjectAppearanceMinefield: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeClass.java b/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeClass.java
index fbcfc016a1..1a2ecfde5d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeClass.java
@@ -528,4 +528,10 @@ public enum ArticulatedPartsTypeClass
     {
         return 4; // 32 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ArticulatedPartsTypeClass: " + name() + ": " + getValue();
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeMetric.java b/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeMetric.java
index 9b8d1cfd46..7b1e38a399 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeMetric.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeMetric.java
@@ -123,4 +123,10 @@ public enum ArticulatedPartsTypeMetric
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ArticulatedPartsTypeMetric: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AttachedPartDetachedIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/AttachedPartDetachedIndicator.java
index 03efe5a25f..b1af4dc8b9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AttachedPartDetachedIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AttachedPartDetachedIndicator.java
@@ -93,4 +93,10 @@ public enum AttachedPartDetachedIndicator
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AttachedPartDetachedIndicator: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AttachedParts.java b/src-generated/edu/nps/moves/dis7/enumerations/AttachedParts.java
index 433e613608..dca5e21a7e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AttachedParts.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AttachedParts.java
@@ -96,4 +96,10 @@ public enum AttachedParts
     {
         return 4; // 32 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AttachedParts: " + name() + ": " + getValue();
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AustralianCategoryOverlay.java b/src-generated/edu/nps/moves/dis7/enumerations/AustralianCategoryOverlay.java
index e070640379..a3dfa3f50d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AustralianCategoryOverlay.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AustralianCategoryOverlay.java
@@ -101,4 +101,10 @@ public enum AustralianCategoryOverlay
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "AustralianCategoryOverlay: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/BeamStatusBeamState.java b/src-generated/edu/nps/moves/dis7/enumerations/BeamStatusBeamState.java
index c318f092c6..d8a64ac577 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/BeamStatusBeamState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/BeamStatusBeamState.java
@@ -93,4 +93,10 @@ public enum BeamStatusBeamState
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "BeamStatusBeamState: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/BuildingPaintScheme.java b/src-generated/edu/nps/moves/dis7/enumerations/BuildingPaintScheme.java
index 50f9ba6959..8a18bffd9a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/BuildingPaintScheme.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/BuildingPaintScheme.java
@@ -91,4 +91,10 @@ public enum BuildingPaintScheme
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "BuildingPaintScheme: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSClearChannel.java b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSClearChannel.java
index 8eb661ca72..a9bbd25d0f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSClearChannel.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSClearChannel.java
@@ -93,4 +93,10 @@ public enum CCTTSINCGARSClearChannel
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "CCTTSINCGARSClearChannel: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSStartofMessage.java b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSStartofMessage.java
index 5221a933ae..b10996168b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSStartofMessage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSStartofMessage.java
@@ -93,4 +93,10 @@ public enum CCTTSINCGARSStartofMessage
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "CCTTSINCGARSStartofMessage: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CIGIExtensionPacketID.java b/src-generated/edu/nps/moves/dis7/enumerations/CIGIExtensionPacketID.java
index e21ca5d998..94bed43960 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CIGIExtensionPacketID.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CIGIExtensionPacketID.java
@@ -80,4 +80,10 @@ public enum CIGIExtensionPacketID
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "CIGIExtensionPacketID: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CapabilityReport.java b/src-generated/edu/nps/moves/dis7/enumerations/CapabilityReport.java
index c3070684a7..9a952d1c45 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CapabilityReport.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CapabilityReport.java
@@ -107,4 +107,10 @@ public enum CapabilityReport
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "CapabilityReport: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java b/src-generated/edu/nps/moves/dis7/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java
index 6505c1eb50..0747e1a1a3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java
@@ -91,4 +91,10 @@ public enum Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms implements
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java b/src-generated/edu/nps/moves/dis7/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java
index 5de57e02e0..24c06fcb37 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java
@@ -99,4 +99,10 @@ public enum Class11SupplyCategorySuppliesNonDoctrinal implements Category
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Class11SupplyCategorySuppliesNonDoctrinal: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java b/src-generated/edu/nps/moves/dis7/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java
index 86fb0292a6..871beace03 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java
@@ -111,4 +111,10 @@ public enum Class12SupplyCategorySlingLoadsNonDoctrinal implements Category
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Class12SupplyCategorySlingLoadsNonDoctrinal: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class1SupplyCategorySubsistence.java b/src-generated/edu/nps/moves/dis7/enumerations/Class1SupplyCategorySubsistence.java
index aef0dd71ea..c9a58b60eb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class1SupplyCategorySubsistence.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class1SupplyCategorySubsistence.java
@@ -101,4 +101,10 @@ public enum Class1SupplyCategorySubsistence implements Category
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Class1SupplyCategorySubsistence: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java b/src-generated/edu/nps/moves/dis7/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java
index cd69ddaa14..7f6331d858 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java
@@ -105,4 +105,10 @@ public enum Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies im
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java b/src-generated/edu/nps/moves/dis7/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java
index dbbf622e7a..5c2ac08035 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java
@@ -97,4 +97,10 @@ public enum Class3SupplyCategoryPetroleumOilsLubricants implements Category
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Class3SupplyCategoryPetroleumOilsLubricants: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class4SupplyCategoryConstructionMaterials.java b/src-generated/edu/nps/moves/dis7/enumerations/Class4SupplyCategoryConstructionMaterials.java
index 0dfeca49d2..4241a1b221 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class4SupplyCategoryConstructionMaterials.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class4SupplyCategoryConstructionMaterials.java
@@ -95,4 +95,10 @@ public enum Class4SupplyCategoryConstructionMaterials implements Category
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Class4SupplyCategoryConstructionMaterials: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class6SupplyCategoryPersonnelDemandItems.java b/src-generated/edu/nps/moves/dis7/enumerations/Class6SupplyCategoryPersonnelDemandItems.java
index 4bbe46f630..03786e3608 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class6SupplyCategoryPersonnelDemandItems.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class6SupplyCategoryPersonnelDemandItems.java
@@ -91,4 +91,10 @@ public enum Class6SupplyCategoryPersonnelDemandItems implements Category
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Class6SupplyCategoryPersonnelDemandItems: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class7SupplyCategoryMajorItems.java b/src-generated/edu/nps/moves/dis7/enumerations/Class7SupplyCategoryMajorItems.java
index 08a246ece2..8bba754562 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class7SupplyCategoryMajorItems.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class7SupplyCategoryMajorItems.java
@@ -135,4 +135,10 @@ public enum Class7SupplyCategoryMajorItems implements Category
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Class7SupplyCategoryMajorItems: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class8SupplyCategoryMedicalMaterial.java b/src-generated/edu/nps/moves/dis7/enumerations/Class8SupplyCategoryMedicalMaterial.java
index 8d277576ca..8c2a1c8eaa 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class8SupplyCategoryMedicalMaterial.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class8SupplyCategoryMedicalMaterial.java
@@ -95,4 +95,10 @@ public enum Class8SupplyCategoryMedicalMaterial implements Category
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Class8SupplyCategoryMedicalMaterial: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class9SupplyCategoryRepairPartsandComponents.java b/src-generated/edu/nps/moves/dis7/enumerations/Class9SupplyCategoryRepairPartsandComponents.java
index 91c3b87158..39047ed569 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class9SupplyCategoryRepairPartsandComponents.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class9SupplyCategoryRepairPartsandComponents.java
@@ -109,4 +109,10 @@ public enum Class9SupplyCategoryRepairPartsandComponents implements Category
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Class9SupplyCategoryRepairPartsandComponents: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CollisionType.java b/src-generated/edu/nps/moves/dis7/enumerations/CollisionType.java
index 70ba60ed05..e7da3af1b4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CollisionType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CollisionType.java
@@ -95,4 +95,10 @@ public enum CollisionType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "CollisionType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Color.java b/src-generated/edu/nps/moves/dis7/enumerations/Color.java
index 261601d0aa..407da6142a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Color.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Color.java
@@ -411,4 +411,10 @@ public enum Color
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Color: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSmoke.java b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSmoke.java
index dae8ff1337..b93ab4db90 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSmoke.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSmoke.java
@@ -97,4 +97,10 @@ public enum ComponentVisualDamageStatusSmoke
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ComponentVisualDamageStatusSmoke: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSurfaceDamage.java b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSurfaceDamage.java
index bfa9ba9947..eee1f83633 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSurfaceDamage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSurfaceDamage.java
@@ -97,4 +97,10 @@ public enum ComponentVisualDamageStatusSurfaceDamage
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ComponentVisualDamageStatusSurfaceDamage: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Country.java b/src-generated/edu/nps/moves/dis7/enumerations/Country.java
index 2b88addc03..61e8a017a5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Country.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Country.java
@@ -632,4 +632,10 @@ public enum Country
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Country: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CoverShroudStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/CoverShroudStatus.java
index bf05944395..05b47428b6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CoverShroudStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CoverShroudStatus.java
@@ -97,4 +97,10 @@ public enum CoverShroudStatus
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "CoverShroudStatus: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CryptoKeyIDCryptoMode.java b/src-generated/edu/nps/moves/dis7/enumerations/CryptoKeyIDCryptoMode.java
index 628a63899b..804b60a894 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CryptoKeyIDCryptoMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CryptoKeyIDCryptoMode.java
@@ -93,4 +93,10 @@ public enum CryptoKeyIDCryptoMode
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "CryptoKeyIDCryptoMode: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CulturalFeatureAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/CulturalFeatureAppearance.java
index ab607b8261..ee6a0e9684 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CulturalFeatureAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CulturalFeatureAppearance.java
@@ -109,4 +109,10 @@ public class CulturalFeatureAppearance extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "CulturalFeatureAppearance: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CulturalFeatureCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/CulturalFeatureCapabilities.java
index d20808a267..1d5268d019 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CulturalFeatureCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CulturalFeatureCapabilities.java
@@ -85,4 +85,10 @@ public class CulturalFeatureCapabilities extends DisBitSet implements EntityCapa
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "CulturalFeatureCapabilities: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentDamageStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentDamageStatus.java
index 3730bf3c1f..2e99b5fcf1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentDamageStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentDamageStatus.java
@@ -99,4 +99,10 @@ public enum DEDamageDescriptionComponentDamageStatus
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DEDamageDescriptionComponentDamageStatus: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualDamageStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualDamageStatus.java
index 7440815134..5a7dece79b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualDamageStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualDamageStatus.java
@@ -85,4 +85,10 @@ public class DEDamageDescriptionComponentVisualDamageStatus extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "DEDamageDescriptionComponentVisualDamageStatus: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java
index 39a048cc16..d020bd6dcf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java
@@ -97,4 +97,10 @@ public enum DEDamageDescriptionComponentVisualSmokeColor
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DEDamageDescriptionComponentVisualSmokeColor: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlags.java b/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlags.java
index ab9b9f46ec..3756fa5ae6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlags.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlags.java
@@ -81,4 +81,10 @@ public class DEFireFlags extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "DEFireFlags: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlagsStateUpdateFlag.java b/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlagsStateUpdateFlag.java
index 3aea311431..224c27c329 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlagsStateUpdateFlag.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlagsStateUpdateFlag.java
@@ -93,4 +93,10 @@ public enum DEFireFlagsStateUpdateFlag
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DEFireFlagsStateUpdateFlag: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEFirePulseShape.java b/src-generated/edu/nps/moves/dis7/enumerations/DEFirePulseShape.java
index 54fd6cbca1..045e18d0cf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEFirePulseShape.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEFirePulseShape.java
@@ -97,4 +97,10 @@ public enum DEFirePulseShape
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DEFirePulseShape: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEPrecisionAimpointBeamSpotType.java b/src-generated/edu/nps/moves/dis7/enumerations/DEPrecisionAimpointBeamSpotType.java
index daba905480..beabd009be 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEPrecisionAimpointBeamSpotType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEPrecisionAimpointBeamSpotType.java
@@ -95,4 +95,10 @@ public enum DEPrecisionAimpointBeamSpotType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DEPrecisionAimpointBeamSpotType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISAttributeActionCode.java b/src-generated/edu/nps/moves/dis7/enumerations/DISAttributeActionCode.java
index f6091b3952..051ed2b918 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISAttributeActionCode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISAttributeActionCode.java
@@ -91,4 +91,10 @@ public enum DISAttributeActionCode
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DISAttributeActionCode: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISLiveEntitySubprotocolNumber.java b/src-generated/edu/nps/moves/dis7/enumerations/DISLiveEntitySubprotocolNumber.java
index 419f1a89fc..3a9a02fe93 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISLiveEntitySubprotocolNumber.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISLiveEntitySubprotocolNumber.java
@@ -91,4 +91,10 @@ public enum DISLiveEntitySubprotocolNumber
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DISLiveEntitySubprotocolNumber: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java
index de532eacc3..ab6462e6a5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java
@@ -93,4 +93,10 @@ public enum DISPDUStatusActiveInterrogationIndicatorAII
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DISPDUStatusActiveInterrogationIndicatorAII: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java
index a96572f26e..c1bb9ee647 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java
@@ -93,4 +93,10 @@ public enum DISPDUStatusCoupledExtensionIndicatorCEI
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DISPDUStatusCoupledExtensionIndicatorCEI: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java
index 2908fe978d..72bba58ebe 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java
@@ -95,4 +95,10 @@ public enum DISPDUStatusDetonationTypeIndicatorDTI
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DISPDUStatusDetonationTypeIndicatorDTI: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusFireTypeIndicatorFTI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusFireTypeIndicatorFTI.java
index 28fe35a893..3e302f4463 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusFireTypeIndicatorFTI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusFireTypeIndicatorFTI.java
@@ -93,4 +93,10 @@ public enum DISPDUStatusFireTypeIndicatorFTI
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DISPDUStatusFireTypeIndicatorFTI: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIFFSimulationModeISM.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIFFSimulationModeISM.java
index 203a9f4924..3c266e689b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIFFSimulationModeISM.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIFFSimulationModeISM.java
@@ -93,4 +93,10 @@ public enum DISPDUStatusIFFSimulationModeISM
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DISPDUStatusIFFSimulationModeISM: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java
index 5fea08af20..c32afa26b2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java
@@ -95,4 +95,10 @@ public enum DISPDUStatusIntercomAttachedIndicatorIAI
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DISPDUStatusIntercomAttachedIndicatorIAI: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusLVCIndicatorLVC.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusLVCIndicatorLVC.java
index 45acb3ce61..302edb3618 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusLVCIndicatorLVC.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusLVCIndicatorLVC.java
@@ -97,4 +97,10 @@ public enum DISPDUStatusLVCIndicatorLVC
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DISPDUStatusLVCIndicatorLVC: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java
index f2e75f484d..0d9c7f5ffe 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java
@@ -95,4 +95,10 @@ public enum DISPDUStatusRadioAttachedIndicatorRAI
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DISPDUStatusRadioAttachedIndicatorRAI: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java
index a414baacad..83cc8e4250 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java
@@ -93,4 +93,10 @@ public enum DISPDUStatusTransferredEntityIndicatorTEI
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DISPDUStatusTransferredEntityIndicatorTEI: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java
index e4f16a3eac..20c44ac332 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java
@@ -235,4 +235,10 @@ public enum DISPDUType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DISPDUType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolFamily.java b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolFamily.java
index 5eb24d459d..f6e6fbd629 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolFamily.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolFamily.java
@@ -117,4 +117,10 @@ public enum DISProtocolFamily
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DISProtocolFamily: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolVersion.java b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolVersion.java
index c39a6dd258..ed1b6b3c9b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolVersion.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolVersion.java
@@ -105,4 +105,10 @@ public enum DISProtocolVersion
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DISProtocolVersion: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DRParametersType.java b/src-generated/edu/nps/moves/dis7/enumerations/DRParametersType.java
index 6f75d72348..d7c7e1e48d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DRParametersType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DRParametersType.java
@@ -95,4 +95,10 @@ public enum DRParametersType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DRParametersType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DataCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/DataCategory.java
index 9609b70673..be2e921902 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DataCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DataCategory.java
@@ -95,4 +95,10 @@ public enum DataCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DataCategory: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DeadReckoningAlgorithm.java b/src-generated/edu/nps/moves/dis7/enumerations/DeadReckoningAlgorithm.java
index ed67b559fe..761f6379bf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DeadReckoningAlgorithm.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DeadReckoningAlgorithm.java
@@ -109,4 +109,10 @@ public enum DeadReckoningAlgorithm
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DeadReckoningAlgorithm: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java
index 57dbc56567..3b3f7b23fc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java
@@ -93,4 +93,10 @@ public enum DeltaMode5SAltitudePositiveNegativeIndicator
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DeltaMode5SAltitudePositiveNegativeIndicator: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DesignatorDesignatorCode.java b/src-generated/edu/nps/moves/dis7/enumerations/DesignatorDesignatorCode.java
index 1f4d629650..313a3986b1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DesignatorDesignatorCode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DesignatorDesignatorCode.java
@@ -78,4 +78,10 @@ public enum DesignatorDesignatorCode
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DesignatorDesignatorCode: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DesignatorSystemName.java b/src-generated/edu/nps/moves/dis7/enumerations/DesignatorSystemName.java
index 12ab32ab1f..d43e89409f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DesignatorSystemName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DesignatorSystemName.java
@@ -250,4 +250,10 @@ public enum DesignatorSystemName
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DesignatorSystemName: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DetonationResult.java b/src-generated/edu/nps/moves/dis7/enumerations/DetonationResult.java
index c2b891b785..6dae2f84e5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DetonationResult.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DetonationResult.java
@@ -157,4 +157,10 @@ public enum DetonationResult
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "DetonationResult: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EEAttributeStateIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/EEAttributeStateIndicator.java
index 897df4ddc8..4a55c4e0d3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EEAttributeStateIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EEAttributeStateIndicator.java
@@ -95,4 +95,10 @@ public enum EEAttributeStateIndicator
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "EEAttributeStateIndicator: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionBeamFunction.java b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionBeamFunction.java
index d6892daf95..d407ca993d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionBeamFunction.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionBeamFunction.java
@@ -137,4 +137,10 @@ public enum ElectromagneticEmissionBeamFunction
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ElectromagneticEmissionBeamFunction: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionStateUpdateIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionStateUpdateIndicator.java
index 45aa9ee4ff..6b1540aa53 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionStateUpdateIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionStateUpdateIndicator.java
@@ -93,4 +93,10 @@ public enum ElectromagneticEmissionStateUpdateIndicator
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ElectromagneticEmissionStateUpdateIndicator: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EmitterName.java b/src-generated/edu/nps/moves/dis7/enumerations/EmitterName.java
index d72cec4668..98ede1e0c5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EmitterName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EmitterName.java
@@ -4078,4 +4078,10 @@ public enum EmitterName
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "EmitterName: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EmitterSystemFunction.java b/src-generated/edu/nps/moves/dis7/enumerations/EmitterSystemFunction.java
index 1cb953aab0..df77ed8292 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EmitterSystemFunction.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EmitterSystemFunction.java
@@ -251,4 +251,10 @@ public enum EmitterSystemFunction
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "EmitterSystemFunction: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationStatus.java
index 963b6f64a4..e2700032b2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationStatus.java
@@ -103,4 +103,10 @@ public enum EntityAssociationAssociationStatus
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "EntityAssociationAssociationStatus: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationType.java
index 081e3626a9..ee0ae4a345 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationType.java
@@ -119,4 +119,10 @@ public enum EntityAssociationAssociationType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "EntityAssociationAssociationType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationGroupMemberType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationGroupMemberType.java
index 18e27c2ee2..4d43b8e61f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationGroupMemberType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationGroupMemberType.java
@@ -103,4 +103,10 @@ public enum EntityAssociationGroupMemberType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "EntityAssociationGroupMemberType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalAssociationType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalAssociationType.java
index 6ec86bcb50..f7071b7de4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalAssociationType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalAssociationType.java
@@ -145,4 +145,10 @@ public enum EntityAssociationPhysicalAssociationType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "EntityAssociationPhysicalAssociationType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalConnectionType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalConnectionType.java
index 4f2d32efb9..66c194c8e5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalConnectionType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalConnectionType.java
@@ -115,4 +115,10 @@ public enum EntityAssociationPhysicalConnectionType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "EntityAssociationPhysicalConnectionType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityCapabilityTypes.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityCapabilityTypes.java
index d185d39bcc..92106115ec 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityCapabilityTypes.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityCapabilityTypes.java
@@ -87,4 +87,10 @@ public enum EntityCapabilityTypes
     {
         return 4; // 32 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "EntityCapabilityTypes: " + name() + ": " + getValue();
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityDamageStatusComponentIdentification.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityDamageStatusComponentIdentification.java
index 273ac8bd81..95ac1d8ee4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityDamageStatusComponentIdentification.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityDamageStatusComponentIdentification.java
@@ -109,4 +109,10 @@ public enum EntityDamageStatusComponentIdentification
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "EntityDamageStatusComponentIdentification: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityKind.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityKind.java
index beb3fd2843..c570834305 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityKind.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityKind.java
@@ -109,4 +109,10 @@ public enum EntityKind
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "EntityKind: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityMarkingCharacterSet.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityMarkingCharacterSet.java
index 89ce65d402..654eb08c92 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityMarkingCharacterSet.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityMarkingCharacterSet.java
@@ -97,4 +97,10 @@ public enum EntityMarkingCharacterSet
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "EntityMarkingCharacterSet: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityVPRecordChangeIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityVPRecordChangeIndicator.java
index d7d08bbad2..be48bb685a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityVPRecordChangeIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityVPRecordChangeIndicator.java
@@ -93,4 +93,10 @@ public enum EntityVPRecordChangeIndicator
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "EntityVPRecordChangeIndicator: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentRecordTypeGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentRecordTypeGroups.java
index 07f775ce8a..3bc792ba61 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentRecordTypeGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentRecordTypeGroups.java
@@ -93,4 +93,10 @@ public enum EnvironmentRecordTypeGroups
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "EnvironmentRecordTypeGroups: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalAppearance.java
index dd57b572d5..16be958233 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalAppearance.java
@@ -89,4 +89,10 @@ public class EnvironmentalAppearance extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "EnvironmentalAppearance: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalCapabilities.java
index dd1462f704..85511f6108 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalCapabilities.java
@@ -81,4 +81,10 @@ public class EnvironmentalCapabilities extends DisBitSet implements EntityCapabi
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "EnvironmentalCapabilities: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessEnvironmentStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessEnvironmentStatus.java
index 8de381c2b8..6d2f0c5c06 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessEnvironmentStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessEnvironmentStatus.java
@@ -81,4 +81,10 @@ public class EnvironmentalProcessEnvironmentStatus extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "EnvironmentalProcessEnvironmentStatus: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessModelType.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessModelType.java
index cb1f4bcb3d..8ce57d6775 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessModelType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessModelType.java
@@ -91,4 +91,10 @@ public enum EnvironmentalProcessModelType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "EnvironmentalProcessModelType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessRecordType.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessRecordType.java
index 2cbe1cd631..0be711bdaa 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessRecordType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessRecordType.java
@@ -112,4 +112,10 @@ public enum EnvironmentalProcessRecordType
     {
         return 4; // 32 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "EnvironmentalProcessRecordType: " + name() + ": " + getValue();
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalSubcategory.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalSubcategory.java
index 084a8c25e3..8864d8b47c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalSubcategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalSubcategory.java
@@ -101,4 +101,10 @@ public enum EnvironmentalSubcategory implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "EnvironmentalSubcategory: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EventReportEventType.java b/src-generated/edu/nps/moves/dis7/enumerations/EventReportEventType.java
index 5f6b602bfe..f9aa4f2084 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EventReportEventType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EventReportEventType.java
@@ -112,4 +112,10 @@ public enum EventReportEventType
     {
         return 4; // 32 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "EventReportEventType: " + name() + ": " + getValue();
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAirCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAirCategory.java
index bd5a2c940e..6a8603f626 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAirCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAirCategory.java
@@ -107,4 +107,10 @@ public enum ExpendableAirCategory implements Category
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ExpendableAirCategory: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAppearance.java
index 451c69618d..78780e65fc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAppearance.java
@@ -121,4 +121,10 @@ public class ExpendableAppearance extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "ExpendableAppearance: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableCapabilities.java
index 084d0b9122..73f16dce2a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableCapabilities.java
@@ -77,4 +77,10 @@ public class ExpendableCapabilities extends DisBitSet implements EntityCapabilit
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "ExpendableCapabilities: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSubsurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSubsurfaceCategory.java
index 57cc64790f..807656e66e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSubsurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSubsurfaceCategory.java
@@ -103,4 +103,10 @@ public enum ExpendableSubsurfaceCategory implements Category
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ExpendableSubsurfaceCategory: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSurfaceCategory.java
index 121bfca24c..1c4b44c345 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSurfaceCategory.java
@@ -99,4 +99,10 @@ public enum ExpendableSurfaceCategory implements Category
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ExpendableSurfaceCategory: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialCategories.java b/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialCategories.java
index e6ca22da17..503c835461 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialCategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialCategories.java
@@ -164,4 +164,10 @@ public enum ExplosiveMaterialCategories
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ExplosiveMaterialCategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialGroups.java
index 583b259b60..936d7d26f4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialGroups.java
@@ -103,4 +103,10 @@ public enum ExplosiveMaterialGroups
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ExplosiveMaterialGroups: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeColor.java b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeColor.java
index 205fe58608..cc7b1524bf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeColor.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeColor.java
@@ -97,4 +97,10 @@ public enum FlareSmokeColor
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "FlareSmokeColor: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeStatus.java
index b0e42eea30..5dab4f2aec 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeStatus.java
@@ -95,4 +95,10 @@ public enum FlareSmokeStatus
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "FlareSmokeStatus: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ForceID.java b/src-generated/edu/nps/moves/dis7/enumerations/ForceID.java
index c5b1c9e31c..41b09c3875 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ForceID.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ForceID.java
@@ -151,4 +151,10 @@ public enum ForceID
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ForceID: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FormatType.java b/src-generated/edu/nps/moves/dis7/enumerations/FormatType.java
index 5ba98fd297..1a43f05bba 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FormatType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FormatType.java
@@ -117,4 +117,10 @@ public enum FormatType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "FormatType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FuelLocation.java b/src-generated/edu/nps/moves/dis7/enumerations/FuelLocation.java
index aacb0ab795..788347fb79 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FuelLocation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FuelLocation.java
@@ -91,4 +91,10 @@ public enum FuelLocation
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "FuelLocation: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FuelMeasurementUnits.java b/src-generated/edu/nps/moves/dis7/enumerations/FuelMeasurementUnits.java
index cbeed536d3..968d56bb63 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FuelMeasurementUnits.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FuelMeasurementUnits.java
@@ -95,4 +95,10 @@ public enum FuelMeasurementUnits
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "FuelMeasurementUnits: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GridAxisDescriptorAxisType.java b/src-generated/edu/nps/moves/dis7/enumerations/GridAxisDescriptorAxisType.java
index b16e449b81..ac9f011754 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GridAxisDescriptorAxisType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GridAxisDescriptorAxisType.java
@@ -93,4 +93,10 @@ public enum GridAxisDescriptorAxisType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "GridAxisDescriptorAxisType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataConstantGrid.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataConstantGrid.java
index 95648e365b..ffcc2f44b2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataConstantGrid.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataConstantGrid.java
@@ -93,4 +93,10 @@ public enum GriddedDataConstantGrid
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "GriddedDataConstantGrid: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataCoordinateSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataCoordinateSystem.java
index b3510298dc..7bc9729b06 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataCoordinateSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataCoordinateSystem.java
@@ -82,4 +82,10 @@ public enum GriddedDataCoordinateSystem
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "GriddedDataCoordinateSystem: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataDataRepresentation.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataDataRepresentation.java
index 3be651ca16..2a462c7bc9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataDataRepresentation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataDataRepresentation.java
@@ -80,4 +80,10 @@ public enum GriddedDataDataRepresentation
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "GriddedDataDataRepresentation: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataFieldNumber.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataFieldNumber.java
index f60bb52227..c7945d6e23 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataFieldNumber.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataFieldNumber.java
@@ -76,4 +76,10 @@ public enum GriddedDataFieldNumber
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "GriddedDataFieldNumber: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataSampleType.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataSampleType.java
index caac6c907a..1e35fe2d00 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataSampleType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataSampleType.java
@@ -76,4 +76,10 @@ public enum GriddedDataSampleType
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "GriddedDataSampleType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/HighDensityTrackJam.java b/src-generated/edu/nps/moves/dis7/enumerations/HighDensityTrackJam.java
index 28e0231e82..743c744ca4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/HighDensityTrackJam.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/HighDensityTrackJam.java
@@ -93,4 +93,10 @@ public enum HighDensityTrackJam
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "HighDensityTrackJam: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java
index ce44be6b7d..c5f8fd1840 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java
@@ -93,4 +93,10 @@ public enum HighFidelityHAVEQUICKTODTransmitIndicator
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "HighFidelityHAVEQUICKTODTransmitIndicator: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFAlternateMode4ChallengeReply.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFAlternateMode4ChallengeReply.java
index 75e2d3e50f..30f1b8a88c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFAlternateMode4ChallengeReply.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFAlternateMode4ChallengeReply.java
@@ -99,4 +99,10 @@ public enum IFFAlternateMode4ChallengeReply
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IFFAlternateMode4ChallengeReply: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFApplicableModes.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFApplicableModes.java
index 273d65233a..6cf00924dd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFApplicableModes.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFApplicableModes.java
@@ -93,4 +93,10 @@ public enum IFFApplicableModes
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IFFApplicableModes: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFDataRecordAvailable.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFDataRecordAvailable.java
index 993f283195..24ccbdc2e8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFDataRecordAvailable.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFDataRecordAvailable.java
@@ -93,4 +93,10 @@ public enum IFFDataRecordAvailable
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IFFDataRecordAvailable: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFLayerSpecificInformation.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFLayerSpecificInformation.java
index 5b9f578b0a..9b13753b39 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFLayerSpecificInformation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFLayerSpecificInformation.java
@@ -91,4 +91,10 @@ public enum IFFLayerSpecificInformation
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IFFLayerSpecificInformation: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSimulationMode.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSimulationMode.java
index 445cbd9058..f769bba4bb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSimulationMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSimulationMode.java
@@ -93,4 +93,10 @@ public enum IFFSimulationMode
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IFFSimulationMode: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemMode.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemMode.java
index 820461ee91..0463260fcf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemMode.java
@@ -101,4 +101,10 @@ public enum IFFSystemMode
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IFFSystemMode: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemName.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemName.java
index 5cf76bc000..430ac6e52b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemName.java
@@ -112,4 +112,10 @@ public enum IFFSystemName
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IFFSystemName: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType.java
index 38a7a451b7..4ee079df14 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType.java
@@ -104,4 +104,10 @@ public enum IFFSystemType
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IFFSystemType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter1.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter1.java
index 3dba669335..6094c6b182 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter1.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter1.java
@@ -91,4 +91,10 @@ public enum IFFSystemType1OperationalParameter1
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IFFSystemType1OperationalParameter1: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter2.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter2.java
index b22ae06216..1a94ee7cf1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter2.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter2.java
@@ -91,4 +91,10 @@ public enum IFFSystemType1OperationalParameter2
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IFFSystemType1OperationalParameter2: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionPhase.java b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionPhase.java
index fbffafcd4d..67c758445a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionPhase.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionPhase.java
@@ -88,4 +88,10 @@ public enum IOActionIOActionPhase
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IOActionIOActionPhase: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionType.java
index d0b41aca48..b5c6bb7bb4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionType.java
@@ -80,4 +80,10 @@ public enum IOActionIOActionType
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IOActionIOActionType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOSimulationSource.java b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOSimulationSource.java
index aad7c711d2..b53b9bd594 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOSimulationSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOSimulationSource.java
@@ -78,4 +78,10 @@ public enum IOActionIOSimulationSource
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IOActionIOSimulationSource: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOWarfareType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOWarfareType.java
index 8a055bf7d1..9f06fab9a7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOWarfareType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOWarfareType.java
@@ -88,4 +88,10 @@ public enum IOActionIOWarfareType
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IOActionIOWarfareType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOCommsNodeRecordCommsNodeType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOCommsNodeRecordCommsNodeType.java
index 4d7a89c74f..ad51170340 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOCommsNodeRecordCommsNodeType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOCommsNodeRecordCommsNodeType.java
@@ -97,4 +97,10 @@ public enum IOCommsNodeRecordCommsNodeType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IOCommsNodeRecordCommsNodeType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOEffect.java b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOEffect.java
index 44533a37d9..60c24f1e0e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOEffect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOEffect.java
@@ -99,4 +99,10 @@ public enum IOEffectsRecordIOEffect
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IOEffectsRecordIOEffect: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOLinkType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOLinkType.java
index fc1dd9d46c..0b5b99cb96 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOLinkType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOLinkType.java
@@ -97,4 +97,10 @@ public enum IOEffectsRecordIOLinkType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IOEffectsRecordIOLinkType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOProcess.java b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOProcess.java
index 9f78d8257e..4f3f640ad5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOProcess.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOProcess.java
@@ -76,4 +76,10 @@ public enum IOEffectsRecordIOProcess
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IOEffectsRecordIOProcess: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOStatus.java
index 894222cd38..9f4ff9c5d5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOStatus.java
@@ -105,4 +105,10 @@ public enum IOEffectsRecordIOStatus
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IOEffectsRecordIOStatus: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOReportIOReportType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOReportIOReportType.java
index c5aec11a68..62d52c5b54 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOReportIOReportType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOReportIOReportType.java
@@ -97,4 +97,10 @@ public enum IOReportIOReportType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IOReportIOReportType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ISLSAntennaType.java b/src-generated/edu/nps/moves/dis7/enumerations/ISLSAntennaType.java
index 1e33615b66..808caef0d4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ISLSAntennaType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ISLSAntennaType.java
@@ -93,4 +93,10 @@ public enum ISLSAntennaType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ISLSAntennaType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommand.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommand.java
index 1e418f3228..4e08238d5e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommand.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommand.java
@@ -103,4 +103,10 @@ public enum IntercomControlCommand
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IntercomControlCommand: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsClass.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsClass.java
index c726888f81..4078bf4874 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsClass.java
@@ -93,4 +93,10 @@ public enum IntercomControlCommunicationsClass
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IntercomControlCommunicationsClass: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsType.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsType.java
index 354e3efa31..ccf366e0dd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsType.java
@@ -99,4 +99,10 @@ public enum IntercomControlCommunicationsType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IntercomControlCommunicationsType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlControlType.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlControlType.java
index d23c23a536..bda567b9ac 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlControlType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlControlType.java
@@ -101,4 +101,10 @@ public enum IntercomControlControlType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IntercomControlControlType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlDestinationLineStateCommand.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlDestinationLineStateCommand.java
index 3b38d4ce42..ceb4a07249 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlDestinationLineStateCommand.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlDestinationLineStateCommand.java
@@ -97,4 +97,10 @@ public enum IntercomControlDestinationLineStateCommand
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IntercomControlDestinationLineStateCommand: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlRecordType.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlRecordType.java
index 06d54596c1..eeb77fce67 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlRecordType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlRecordType.java
@@ -80,4 +80,10 @@ public enum IntercomControlRecordType
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IntercomControlRecordType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlTransmitLineState.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlTransmitLineState.java
index 2e23e76b9e..ac05451c47 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlTransmitLineState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlTransmitLineState.java
@@ -95,4 +95,10 @@ public enum IntercomControlTransmitLineState
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IntercomControlTransmitLineState: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfGroupedEntityCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfGroupedEntityCategory.java
index b416ae8cf2..914f24760e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfGroupedEntityCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfGroupedEntityCategory.java
@@ -109,4 +109,10 @@ public enum IsGroupOfGroupedEntityCategory implements Category
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IsGroupOfGroupedEntityCategory: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfRestStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfRestStatus.java
index ef5ee7897a..3776052193 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfRestStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfRestStatus.java
@@ -107,4 +107,10 @@ public enum IsGroupOfRestStatus
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IsGroupOfRestStatus: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfNature.java b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfNature.java
index 1d1e9b2c41..63eb5dbe6d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfNature.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfNature.java
@@ -96,4 +96,10 @@ public enum IsPartOfNature
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IsPartOfNature: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfPosition.java b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfPosition.java
index 4802bd4ea2..87bd4c6af7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfPosition.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfPosition.java
@@ -80,4 +80,10 @@ public enum IsPartOfPosition
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IsPartOfPosition: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfStationName.java b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfStationName.java
index a5d9cc0786..e395f81fe5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfStationName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfStationName.java
@@ -112,4 +112,10 @@ public enum IsPartOfStationName
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IsPartOfStationName: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IslandSubcategory.java b/src-generated/edu/nps/moves/dis7/enumerations/IslandSubcategory.java
index 2eda855c9b..099612a29f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IslandSubcategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IslandSubcategory.java
@@ -88,4 +88,10 @@ public enum IslandSubcategory implements SubCategory
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "IslandSubcategory: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java
index fcb7bce422..2518ffd05f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java
@@ -97,4 +97,10 @@ public enum JTIDSMIDSModulationParametersSynchronizationState
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "JTIDSMIDSModulationParametersSynchronizationState: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java
index f9c0b02a1e..6342c34d3a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java
@@ -93,4 +93,10 @@ public enum JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java
index c2673e4dc2..e290ecde33 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java
@@ -97,4 +97,10 @@ public enum JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LandPlatformAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/LandPlatformAppearance.java
index b7610ae891..2cc7ff16a5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LandPlatformAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LandPlatformAppearance.java
@@ -177,4 +177,10 @@ public class LandPlatformAppearance extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "LandPlatformAppearance: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LandPlatformCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/LandPlatformCapabilities.java
index d794e4db84..0818bdbbaa 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LandPlatformCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LandPlatformCapabilities.java
@@ -105,4 +105,10 @@ public class LandPlatformCapabilities extends DisBitSet implements EntityCapabil
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "LandPlatformCapabilities: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LeafCoverage.java b/src-generated/edu/nps/moves/dis7/enumerations/LeafCoverage.java
index 69e7cdf971..d35e1fe2b4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LeafCoverage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LeafCoverage.java
@@ -93,4 +93,10 @@ public enum LeafCoverage
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LeafCoverage: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Level2SquitterStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/Level2SquitterStatus.java
index 60a2aa4f68..98c1cd8465 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Level2SquitterStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Level2SquitterStatus.java
@@ -93,4 +93,10 @@ public enum Level2SquitterStatus
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Level2SquitterStatus: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormAirCategories.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormAirCategories.java
index db95eec344..b4d82ddaf9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormAirCategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormAirCategories.java
@@ -92,4 +92,10 @@ public enum LifeFormAirCategories
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormAirCategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesUS.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesUS.java
index 6bc3d209f7..c27bb4fff0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesUS.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesUS.java
@@ -131,4 +131,10 @@ public enum LifeFormCategoriesUS
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormCategoriesUS: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormExtraPersonalData.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormExtraPersonalData.java
index 81f0166d41..2597efe1f4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormExtraPersonalData.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormExtraPersonalData.java
@@ -167,4 +167,10 @@ public enum LifeFormExtraPersonalData
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormExtraPersonalData: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java
index 1822509e4d..990aa73511 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java
@@ -95,4 +95,10 @@ public enum LifeFormHumanSpecificAntiMaterielRifles
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormHumanSpecificAntiMaterielRifles: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankMissiles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankMissiles.java
index e91bce65fe..04ed40a03a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankMissiles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankMissiles.java
@@ -237,4 +237,10 @@ public enum LifeFormHumanSpecificAntiTankMissiles
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormHumanSpecificAntiTankMissiles: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankRockets.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankRockets.java
index ff3b16a0f9..dd5698944c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankRockets.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankRockets.java
@@ -227,4 +227,10 @@ public enum LifeFormHumanSpecificAntiTankRockets
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormHumanSpecificAntiTankRockets: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAssaultRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAssaultRifles.java
index 74e92a546d..b822514cd5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAssaultRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAssaultRifles.java
@@ -209,4 +209,10 @@ public enum LifeFormHumanSpecificAssaultRifles
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormHumanSpecificAssaultRifles: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificDroneGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificDroneGuns.java
index d1b3e584d2..53f33f18c8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificDroneGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificDroneGuns.java
@@ -95,4 +95,10 @@ public enum LifeFormHumanSpecificDroneGuns
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormHumanSpecificDroneGuns: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificEquipmentClass.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificEquipmentClass.java
index 3eee71b978..a78660ffab 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificEquipmentClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificEquipmentClass.java
@@ -99,4 +99,10 @@ public enum LifeFormHumanSpecificEquipmentClass
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormHumanSpecificEquipmentClass: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameRockets.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameRockets.java
index 8d4804494f..0561dc7c3c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameRockets.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameRockets.java
@@ -103,4 +103,10 @@ public enum LifeFormHumanSpecificFlameRockets
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormHumanSpecificFlameRockets: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameThrowers.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameThrowers.java
index 138cd74057..dad2de2554 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameThrowers.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameThrowers.java
@@ -119,4 +119,10 @@ public enum LifeFormHumanSpecificFlameThrowers
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormHumanSpecificFlameThrowers: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java
index c030f32fd0..b1441217f6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java
@@ -171,4 +171,10 @@ public enum LifeFormHumanSpecificGrenadeLaunchers
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormHumanSpecificGrenadeLaunchers: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java
index 63d2301cc7..db575d6784 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java
@@ -129,4 +129,10 @@ public enum LifeFormHumanSpecificGrenadeLaunchingMachineGun
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormHumanSpecificGrenadeLaunchingMachineGun: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHandGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHandGuns.java
index 2a7d33ac4b..ff5fb14cb7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHandGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHandGuns.java
@@ -99,4 +99,10 @@ public enum LifeFormHumanSpecificHandGuns
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormHumanSpecificHandGuns: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHighPowerRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHighPowerRifles.java
index 3a6f8d85e2..7e3a161990 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHighPowerRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHighPowerRifles.java
@@ -109,4 +109,10 @@ public enum LifeFormHumanSpecificHighPowerRifles
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormHumanSpecificHighPowerRifles: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMachineGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMachineGuns.java
index 65df00ae16..19173f1066 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMachineGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMachineGuns.java
@@ -263,4 +263,10 @@ public enum LifeFormHumanSpecificMachineGuns
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormHumanSpecificMachineGuns: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java
index cf4b714c2a..d3e7f50c2d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java
@@ -133,4 +133,10 @@ public enum LifeFormHumanSpecificManPortableAirDefenseSystem
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormHumanSpecificManPortableAirDefenseSystem: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMortars.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMortars.java
index e8d3e8884d..4c62382445 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMortars.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMortars.java
@@ -99,4 +99,10 @@ public enum LifeFormHumanSpecificMortars
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormHumanSpecificMortars: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificRecoillessRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificRecoillessRifles.java
index 38b6b250b0..caa7cef07a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificRecoillessRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificRecoillessRifles.java
@@ -147,4 +147,10 @@ public enum LifeFormHumanSpecificRecoillessRifles
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormHumanSpecificRecoillessRifles: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificShotGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificShotGuns.java
index 687a57c2e6..a65cda255b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificShotGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificShotGuns.java
@@ -367,4 +367,10 @@ public enum LifeFormHumanSpecificShotGuns
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormHumanSpecificShotGuns: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSniper.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSniper.java
index f7fdd384ba..b3a2fa9a9a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSniper.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSniper.java
@@ -143,4 +143,10 @@ public enum LifeFormHumanSpecificSniper
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormHumanSpecificSniper: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSubMachineGun.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSubMachineGun.java
index 52911d5771..8d21abb0e6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSubMachineGun.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSubMachineGun.java
@@ -115,4 +115,10 @@ public enum LifeFormHumanSpecificSubMachineGun
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormHumanSpecificSubMachineGun: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificWeaponNonspecific.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificWeaponNonspecific.java
index d6bf4d5f8f..8fcf19eb80 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificWeaponNonspecific.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificWeaponNonspecific.java
@@ -95,4 +95,10 @@ public enum LifeFormHumanSpecificWeaponNonspecific
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormHumanSpecificWeaponNonspecific: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSubcategoryEquipmentClass.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSubcategoryEquipmentClass.java
index da33ddd364..b8fbc8b3b7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSubcategoryEquipmentClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSubcategoryEquipmentClass.java
@@ -121,4 +121,10 @@ public enum LifeFormHumanSubcategoryEquipmentClass
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormHumanSubcategoryEquipmentClass: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormLandCategories.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormLandCategories.java
index aa01fb14a4..0bd2c9041f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormLandCategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormLandCategories.java
@@ -134,4 +134,10 @@ public enum LifeFormLandCategories implements Category
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormLandCategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormSubsurfaceCategories.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormSubsurfaceCategories.java
index 33cefd6468..8b29f57afe 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormSubsurfaceCategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormSubsurfaceCategories.java
@@ -94,4 +94,10 @@ public enum LifeFormSubsurfaceCategories
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormSubsurfaceCategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsAppearance.java
index 80f3fc85b1..13702b8875 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsAppearance.java
@@ -141,4 +141,10 @@ public class LifeFormsAppearance extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "LifeFormsAppearance: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsCapabilities.java
index 7c648f8f2a..ee2633c50b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsCapabilities.java
@@ -93,4 +93,10 @@ public class LifeFormsCapabilities extends DisBitSet implements EntityCapabiliti
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "LifeFormsCapabilities: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryCISWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryCISWeapons.java
index d429b8d217..7747c3e949 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryCISWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryCISWeapons.java
@@ -193,4 +193,10 @@ public enum LifeFormsSubcategoryCISWeapons implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormsSubcategoryCISWeapons: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryFrenchWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryFrenchWeapons.java
index cde38ca5c9..31ff96d0d5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryFrenchWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryFrenchWeapons.java
@@ -105,4 +105,10 @@ public enum LifeFormsSubcategoryFrenchWeapons implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormsSubcategoryFrenchWeapons: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryGermanWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryGermanWeapons.java
index 9b6cb6ce06..948abfd5d0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryGermanWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryGermanWeapons.java
@@ -107,4 +107,10 @@ public enum LifeFormsSubcategoryGermanWeapons implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormsSubcategoryGermanWeapons: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryIranianWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryIranianWeapons.java
index c66de65e41..28162bedf9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryIranianWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryIranianWeapons.java
@@ -93,4 +93,10 @@ public enum LifeFormsSubcategoryIranianWeapons implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormsSubcategoryIranianWeapons: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUKWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUKWeapons.java
index 5fc97def6c..55c9d44afd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUKWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUKWeapons.java
@@ -113,4 +113,10 @@ public enum LifeFormsSubcategoryUKWeapons implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormsSubcategoryUKWeapons: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUSWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUSWeapons.java
index c182d79cce..6000ce8fb7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUSWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUSWeapons.java
@@ -333,4 +333,10 @@ public enum LifeFormsSubcategoryUSWeapons implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeFormsSubcategoryUSWeapons: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeSavingEquipment.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeSavingEquipment.java
index dfd8296cf7..20b46e8b63 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeSavingEquipment.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeSavingEquipment.java
@@ -99,4 +99,10 @@ public enum LifeSavingEquipment implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LifeSavingEquipment: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceBreach.java b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceBreach.java
index 664eae9a92..30580fd932 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceBreach.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceBreach.java
@@ -74,4 +74,10 @@ public class LinearObjectAppearanceBreach extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "LinearObjectAppearanceBreach: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceExhaustSmoke.java b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceExhaustSmoke.java
index df86a02434..5949356e45 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceExhaustSmoke.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceExhaustSmoke.java
@@ -85,4 +85,10 @@ public class LinearObjectAppearanceExhaustSmoke extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "LinearObjectAppearanceExhaustSmoke: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceMinefieldLaneMarker.java b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceMinefieldLaneMarker.java
index 1b632e4eb0..37f1c12413 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceMinefieldLaneMarker.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceMinefieldLaneMarker.java
@@ -77,4 +77,10 @@ public class LinearObjectAppearanceMinefieldLaneMarker extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "LinearObjectAppearanceMinefieldLaneMarker: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceSpeedBump.java b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceSpeedBump.java
index a55883c159..aaa6897a26 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceSpeedBump.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceSpeedBump.java
@@ -85,4 +85,10 @@ public class LinearObjectAppearanceSpeedBump extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "LinearObjectAppearanceSpeedBump: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceTankDitchAndConcertinaWire.java b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceTankDitchAndConcertinaWire.java
index 1568b66001..482392b997 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceTankDitchAndConcertinaWire.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceTankDitchAndConcertinaWire.java
@@ -85,4 +85,10 @@ public class LinearObjectAppearanceTankDitchAndConcertinaWire extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "LinearObjectAppearanceTankDitchAndConcertinaWire: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceWire.java b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceWire.java
index 490159e430..3656e11154 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceWire.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceWire.java
@@ -85,4 +85,10 @@ public class LinearObjectAppearanceWire extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "LinearObjectAppearanceWire: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BDataTerminalSetIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BDataTerminalSetIndicator.java
index 8762c0c0a0..4219d3c742 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BDataTerminalSetIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BDataTerminalSetIndicator.java
@@ -105,4 +105,10 @@ public enum Link1111BDataTerminalSetIndicator
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Link1111BDataTerminalSetIndicator: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BFidelityLevel.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BFidelityLevel.java
index 5e8b5b2d54..234d930507 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BFidelityLevel.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BFidelityLevel.java
@@ -95,4 +95,10 @@ public enum Link1111BFidelityLevel
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Link1111BFidelityLevel: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BModeofOperation.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BModeofOperation.java
index a35348969e..81fc8bc225 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BModeofOperation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BModeofOperation.java
@@ -86,4 +86,10 @@ public enum Link1111BModeofOperation
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Link1111BModeofOperation: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BTerminalMode.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BTerminalMode.java
index 0a84dd6a14..c3c36030c1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BTerminalMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BTerminalMode.java
@@ -95,4 +95,10 @@ public enum Link1111BTerminalMode
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Link1111BTerminalMode: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Material.java b/src-generated/edu/nps/moves/dis7/enumerations/Material.java
index 955a290519..76b25f8b7b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Material.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Material.java
@@ -97,4 +97,10 @@ public enum Material
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Material: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceActiveStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceActiveStatus.java
index 062a1e87dd..a960f29ab2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceActiveStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceActiveStatus.java
@@ -93,4 +93,10 @@ public enum MinefieldAppearanceActiveStatus
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "MinefieldAppearanceActiveStatus: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceLane.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceLane.java
index 0ef78ff3f3..05eee45724 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceLane.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceLane.java
@@ -93,4 +93,10 @@ public enum MinefieldAppearanceLane
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "MinefieldAppearanceLane: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceMinefieldType.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceMinefieldType.java
index ed47bec12f..3c4fd0bf17 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceMinefieldType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceMinefieldType.java
@@ -95,4 +95,10 @@ public enum MinefieldAppearanceMinefieldType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "MinefieldAppearanceMinefieldType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceState.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceState.java
index 8267301d70..238d86d86d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceState.java
@@ -93,4 +93,10 @@ public enum MinefieldAppearanceState
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "MinefieldAppearanceState: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldDataFusing.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldDataFusing.java
index 0ee72224c7..9326e09324 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldDataFusing.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldDataFusing.java
@@ -85,4 +85,10 @@ public class MinefieldDataFusing extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "MinefieldDataFusing: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldDataPaintScheme.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldDataPaintScheme.java
index dbee3f4574..eb1ef0b0f1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldDataPaintScheme.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldDataPaintScheme.java
@@ -81,4 +81,10 @@ public class MinefieldDataPaintScheme extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "MinefieldDataPaintScheme: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldFusingFuseType.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldFusingFuseType.java
index 3a3d37f483..0692d843ef 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldFusingFuseType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldFusingFuseType.java
@@ -103,4 +103,10 @@ public enum MinefieldFusingFuseType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "MinefieldFusingFuseType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemeAlgae.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemeAlgae.java
index 5d57e04c50..26c3486999 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemeAlgae.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemeAlgae.java
@@ -97,4 +97,10 @@ public enum MinefieldPaintSchemeAlgae
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "MinefieldPaintSchemeAlgae: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemePaintScheme.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemePaintScheme.java
index 4fcdaa15d4..8213ff5d70 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemePaintScheme.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemePaintScheme.java
@@ -127,4 +127,10 @@ public enum MinefieldPaintSchemePaintScheme
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "MinefieldPaintSchemePaintScheme: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypes.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypes.java
index c65661d0ab..1795f0b11d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypes.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypes.java
@@ -99,4 +99,10 @@ public enum MinefieldSensorTypes
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "MinefieldSensorTypes: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesFLIR.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesFLIR.java
index cd535e5c6d..778f086ccc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesFLIR.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesFLIR.java
@@ -94,4 +94,10 @@ public enum MinefieldSensorTypesFLIR
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "MinefieldSensorTypesFLIR: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesLaser.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesLaser.java
index 7f08626723..76b1da2fa5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesLaser.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesLaser.java
@@ -78,4 +78,10 @@ public enum MinefieldSensorTypesLaser
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "MinefieldSensorTypesLaser: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMagnetic.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMagnetic.java
index d93fd815a5..85eb33f462 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMagnetic.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMagnetic.java
@@ -82,4 +82,10 @@ public enum MinefieldSensorTypesMagnetic
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "MinefieldSensorTypesMagnetic: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMultispectral.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMultispectral.java
index 142186eb4a..f60eae8359 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMultispectral.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMultispectral.java
@@ -76,4 +76,10 @@ public enum MinefieldSensorTypesMultispectral
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "MinefieldSensorTypesMultispectral: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesOptical.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesOptical.java
index 00625801d1..caca72633d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesOptical.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesOptical.java
@@ -98,4 +98,10 @@ public enum MinefieldSensorTypesOptical
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "MinefieldSensorTypesOptical: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesPhysical.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesPhysical.java
index fd9cd260f7..bc4e0de31f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesPhysical.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesPhysical.java
@@ -80,4 +80,10 @@ public enum MinefieldSensorTypesPhysical
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "MinefieldSensorTypesPhysical: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesRADAR.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesRADAR.java
index b5b896af88..92260e8960 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesRADAR.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesRADAR.java
@@ -86,4 +86,10 @@ public enum MinefieldSensorTypesRADAR
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "MinefieldSensorTypesRADAR: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesSONAR.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesSONAR.java
index 2db96fe3a5..ccc99f73bf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesSONAR.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesSONAR.java
@@ -76,4 +76,10 @@ public enum MinefieldSensorTypesSONAR
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "MinefieldSensorTypesSONAR: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateAppearanceBitMap.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateAppearanceBitMap.java
index 61ef091910..a5d94fc85f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateAppearanceBitMap.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateAppearanceBitMap.java
@@ -89,4 +89,10 @@ public class MinefieldStateAppearanceBitMap extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "MinefieldStateAppearanceBitMap: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateProtocolMode.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateProtocolMode.java
index f850870804..e3990794d0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateProtocolMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateProtocolMode.java
@@ -93,4 +93,10 @@ public enum MinefieldStateProtocolMode
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "MinefieldStateProtocolMode: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5IFFMission.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5IFFMission.java
index 59ec6ee8dd..18c9001b82 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5IFFMission.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5IFFMission.java
@@ -103,4 +103,10 @@ public enum Mode5IFFMission
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Mode5IFFMission: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5LevelSelection.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LevelSelection.java
index f7d954c0eb..645c928d5e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5LevelSelection.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LevelSelection.java
@@ -93,4 +93,10 @@ public enum Mode5LevelSelection
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Mode5LevelSelection: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5LocationErrors.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LocationErrors.java
index 8223d4fa00..25fecbbd5a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5LocationErrors.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LocationErrors.java
@@ -93,4 +93,10 @@ public enum Mode5LocationErrors
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Mode5LocationErrors: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5MessageFormatsStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5MessageFormatsStatus.java
index 49bb2a0882..7abec83c3d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5MessageFormatsStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5MessageFormatsStatus.java
@@ -93,4 +93,10 @@ public enum Mode5MessageFormatsStatus
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Mode5MessageFormatsStatus: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5PlatformType.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5PlatformType.java
index 789493e19f..72de434e0f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5PlatformType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5PlatformType.java
@@ -93,4 +93,10 @@ public enum Mode5PlatformType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Mode5PlatformType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5Reply.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5Reply.java
index 6935f3b472..63a54ae2e1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5Reply.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5Reply.java
@@ -97,4 +97,10 @@ public enum Mode5Reply
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Mode5Reply: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5SAltitudeResolution.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SAltitudeResolution.java
index 1138155d7d..577eb52c70 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5SAltitudeResolution.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SAltitudeResolution.java
@@ -93,4 +93,10 @@ public enum Mode5SAltitudeResolution
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Mode5SAltitudeResolution: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5SquitterType.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SquitterType.java
index e6b288604a..4e56a63f8c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5SquitterType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SquitterType.java
@@ -95,4 +95,10 @@ public enum Mode5SquitterType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Mode5SquitterType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeCAltitudeIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeCAltitudeIndicator.java
index 9e6184bece..3f2aa4e6da 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeCAltitudeIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeCAltitudeIndicator.java
@@ -93,4 +93,10 @@ public enum ModeCAltitudeIndicator
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ModeCAltitudeIndicator: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorIdentifierICType.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorIdentifierICType.java
index fb4040dcc1..fe0a01cf66 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorIdentifierICType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorIdentifierICType.java
@@ -93,4 +93,10 @@ public enum ModeSInterrogatorIdentifierICType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ModeSInterrogatorIdentifierICType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorStatusTransmitState.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorStatusTransmitState.java
index 7848c5c50b..6e6dccb721 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorStatusTransmitState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorStatusTransmitState.java
@@ -101,4 +101,10 @@ public enum ModeSInterrogatorStatusTransmitState
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ModeSInterrogatorStatusTransmitState: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterRecordSource.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterRecordSource.java
index 65e8e0efe0..d4252aacb9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterRecordSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterRecordSource.java
@@ -93,4 +93,10 @@ public enum ModeSSquitterRecordSource
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ModeSSquitterRecordSource: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterType.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterType.java
index 9f8e7c85d5..f9b70362a7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterType.java
@@ -97,4 +97,10 @@ public enum ModeSSquitterType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ModeSSquitterType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionAppearance.java
index c0bce6a2b7..d2c639e4fa 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionAppearance.java
@@ -117,4 +117,10 @@ public class MunitionAppearance extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "MunitionAppearance: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionCapabilities.java
index f6f1f33748..bbf6742afa 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionCapabilities.java
@@ -81,4 +81,10 @@ public class MunitionCapabilities extends DisBitSet implements EntityCapabilitie
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "MunitionCapabilities: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionCategory.java
index db9a1b2e9b..9908e57a41 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionCategory.java
@@ -97,4 +97,10 @@ public enum MunitionCategory implements Category
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "MunitionCategory: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorFuse.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorFuse.java
index 8bd88ce675..8a224e9cbc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorFuse.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorFuse.java
@@ -288,4 +288,10 @@ public enum MunitionDescriptorFuse
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "MunitionDescriptorFuse: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorWarhead.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorWarhead.java
index 38df07484a..6999aa9058 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorWarhead.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorWarhead.java
@@ -266,4 +266,10 @@ public enum MunitionDescriptorWarhead
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "MunitionDescriptorWarhead: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDomain.java
index 974cc9e42a..749b134b9f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDomain.java
@@ -115,4 +115,10 @@ public enum MunitionDomain
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "MunitionDomain: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionExpendableStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionExpendableStatus.java
index e2f05d0f8d..920500120e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionExpendableStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionExpendableStatus.java
@@ -95,4 +95,10 @@ public enum MunitionExpendableStatus
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "MunitionExpendableStatus: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordFrequencyTable.java b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordFrequencyTable.java
index e301e105f0..8023fedb86 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordFrequencyTable.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordFrequencyTable.java
@@ -97,4 +97,10 @@ public enum NETIDRecordFrequencyTable
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "NETIDRecordFrequencyTable: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordMode.java b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordMode.java
index cc2024d3cb..b96eaec08a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordMode.java
@@ -95,4 +95,10 @@ public enum NETIDRecordMode
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "NETIDRecordMode: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/NavigationSource.java b/src-generated/edu/nps/moves/dis7/enumerations/NavigationSource.java
index 1dbad3cedd..c10f9c971c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/NavigationSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/NavigationSource.java
@@ -97,4 +97,10 @@ public enum NavigationSource
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "NavigationSource: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/NonHumanLifeFormsAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/NonHumanLifeFormsAppearance.java
index d55b63e5b6..e3431e2d6a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/NonHumanLifeFormsAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/NonHumanLifeFormsAppearance.java
@@ -89,4 +89,10 @@ public class NonHumanLifeFormsAppearance extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "NonHumanLifeFormsAppearance: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ObjectKind.java b/src-generated/edu/nps/moves/dis7/enumerations/ObjectKind.java
index ee2906234a..1015f20cdf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ObjectKind.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ObjectKind.java
@@ -107,4 +107,10 @@ public enum ObjectKind
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ObjectKind: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateAppearanceGeneral.java b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateAppearanceGeneral.java
index df5bf00b07..bab5164413 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateAppearanceGeneral.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateAppearanceGeneral.java
@@ -101,4 +101,10 @@ public class ObjectStateAppearanceGeneral extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "ObjectStateAppearanceGeneral: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationArealObject.java b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationArealObject.java
index 21a73000b4..d35d126d16 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationArealObject.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationArealObject.java
@@ -77,4 +77,10 @@ public class ObjectStateModificationArealObject extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "ObjectStateModificationArealObject: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationLinearObject.java b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationLinearObject.java
index c12f921f4e..3cae88bd4d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationLinearObject.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationLinearObject.java
@@ -81,4 +81,10 @@ public class ObjectStateModificationLinearObject extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "ObjectStateModificationLinearObject: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationPointObject.java b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationPointObject.java
index 2ce27a6ed4..9297d7851a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationPointObject.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationPointObject.java
@@ -81,4 +81,10 @@ public class ObjectStateModificationPointObject extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "ObjectStateModificationPointObject: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/OwnershipStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/OwnershipStatus.java
index 304ded0165..09515585d5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/OwnershipStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/OwnershipStatus.java
@@ -103,4 +103,10 @@ public enum OwnershipStatus
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "OwnershipStatus: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Parachute.java b/src-generated/edu/nps/moves/dis7/enumerations/Parachute.java
index 30087ac5b9..3c2dfce80c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Parachute.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Parachute.java
@@ -97,4 +97,10 @@ public enum Parachute
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Parachute: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PhysicalAssociationTypeGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/PhysicalAssociationTypeGroups.java
index 2e93043d84..9786922879 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PhysicalAssociationTypeGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PhysicalAssociationTypeGroups.java
@@ -99,4 +99,10 @@ public enum PhysicalAssociationTypeGroups
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PhysicalAssociationTypeGroups: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCategory.java
index 831187b7c7..6c5812d66c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCategory.java
@@ -142,4 +142,10 @@ public enum PlatformAirCategory implements Category
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformAirCategory: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java
index 3be486b0c5..6d858aaa70 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java
@@ -107,4 +107,10 @@ public enum PlatformAirCivilianFixedWingAircraftSubcategories implements SubCate
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformAirCivilianFixedWingAircraftSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianGliderSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianGliderSubcategories.java
index a245f3df70..f2003b53ad 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianGliderSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianGliderSubcategories.java
@@ -95,4 +95,10 @@ public enum PlatformAirCivilianGliderSubcategories implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformAirCivilianGliderSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianHelicopterSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianHelicopterSubcategories.java
index 8adcdc7123..62a599ce7b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianHelicopterSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianHelicopterSubcategories.java
@@ -105,4 +105,10 @@ public enum PlatformAirCivilianHelicopterSubcategories implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformAirCivilianHelicopterSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java
index ea003eb8c7..4b36bd7a92 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java
@@ -99,4 +99,10 @@ public enum PlatformAirCivilianLighterthanAirAirshipSubcategories implements Sub
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformAirCivilianLighterthanAirAirshipSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java
index c4ce6d784f..9ee020180e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java
@@ -101,4 +101,10 @@ public enum PlatformAirCivilianLighterthanAirBalloonSubcategories implements Sub
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformAirCivilianLighterthanAirBalloonSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java
index 33c27db4d7..69683e30cb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java
@@ -101,4 +101,10 @@ public enum PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories imple
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java
index b661f42b19..277c0b1e9c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java
@@ -95,4 +95,10 @@ public enum PlatformAirCivilianUltralightRigidWingAircraftSubcategories implemen
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformAirCivilianUltralightRigidWingAircraftSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformDomain.java
index 1dad48134f..d8757a833f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformDomain.java
@@ -101,4 +101,10 @@ public enum PlatformDomain
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformDomain: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandBusSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandBusSubcategories.java
index c6fb4166dc..2a5f507973 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandBusSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandBusSubcategories.java
@@ -129,4 +129,10 @@ public enum PlatformLandBusSubcategories
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformLandBusSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCarSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCarSubcategories.java
index 00f9144e77..0dd251de5e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCarSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCarSubcategories.java
@@ -179,4 +179,10 @@ public enum PlatformLandCarSubcategories implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformLandCarSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCategory.java
index 40128ea80e..9ef84e1d49 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCategory.java
@@ -187,4 +187,10 @@ public enum PlatformLandCategory implements Category
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformLandCategory: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java
index 4d31911100..b35770f98c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java
@@ -203,4 +203,10 @@ public enum PlatformLandConstructionSpecialtyVehicleSubcategories implements Sub
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformLandConstructionSpecialtyVehicleSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java
index beee022648..f720ce3a81 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java
@@ -109,4 +109,10 @@ public enum PlatformLandFarmSpecialtyVehicleSubcategories implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformLandFarmSpecialtyVehicleSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMotorcycleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMotorcycleSubcategories.java
index ff0fb39737..2662019c06 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMotorcycleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMotorcycleSubcategories.java
@@ -101,4 +101,10 @@ public enum PlatformLandMotorcycleSubcategories implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformLandMotorcycleSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java
index bd1f267290..4f14523252 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java
@@ -97,4 +97,10 @@ public enum PlatformLandMultipleUnitCargoTruckSubcategories implements SubCatego
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformLandMultipleUnitCargoTruckSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java
index cb74483be3..ff2e214d34 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java
@@ -95,4 +95,10 @@ public enum PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories implement
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandNonmotorizedSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandNonmotorizedSubcategories.java
index 7a2e215e06..387c5402ea 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandNonmotorizedSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandNonmotorizedSubcategories.java
@@ -141,4 +141,10 @@ public enum PlatformLandNonmotorizedSubcategories
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformLandNonmotorizedSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandRecreationalSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandRecreationalSubcategories.java
index b84963bd8f..02e8b9201d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandRecreationalSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandRecreationalSubcategories.java
@@ -121,4 +121,10 @@ public enum PlatformLandRecreationalSubcategories implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformLandRecreationalSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java
index f8f517ce36..780fad7530 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java
@@ -155,4 +155,10 @@ public enum PlatformLandSingleUnitCargoTruckSubcategories implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformLandSingleUnitCargoTruckSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java
index d1a6f4a002..97caad8369 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java
@@ -179,4 +179,10 @@ public enum PlatformLandSingleUnitUtilityEmergencyTruckSubcategories implements
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformLandSingleUnitUtilityEmergencyTruckSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrailerSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrailerSubcategories.java
index 5d99ba96a4..4ae26f207c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrailerSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrailerSubcategories.java
@@ -145,4 +145,10 @@ public enum PlatformLandTrailerSubcategories implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformLandTrailerSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrainsSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrainsSubcategories.java
index 5499a65c8c..be2bcb4dec 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrainsSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrainsSubcategories.java
@@ -107,4 +107,10 @@ public enum PlatformLandTrainsSubcategories implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformLandTrainsSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java
index 990e6169fb..9a2f1c5f7c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java
@@ -103,4 +103,10 @@ public enum PlatformLandUtilityEmergencyCarSubcategories implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformLandUtilityEmergencyCarSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSpaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSpaceCategory.java
index 5b7dae050d..bdceea1a33 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSpaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSpaceCategory.java
@@ -97,4 +97,10 @@ public enum PlatformSpaceCategory implements Category
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformSpaceCategory: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCategory.java
index fbe28ecbce..1c4665020d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCategory.java
@@ -129,4 +129,10 @@ public enum PlatformSubsurfaceCategory implements Category
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformSubsurfaceCategory: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java
index 793875df02..6a2583f2e5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java
@@ -93,4 +93,10 @@ public enum PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories implements S
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java
index deceb2f4f2..7d588cb273 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java
@@ -93,4 +93,10 @@ public enum PlatformSubsurfaceCivilianSubmarineSubcategories implements SubCateg
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformSubsurfaceCivilianSubmarineSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java
index 1e03634f34..4dc64688d8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java
@@ -93,4 +93,10 @@ public enum PlatformSubsurfaceCivilianSubmersibleSubcategories implements SubCat
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformSubsurfaceCivilianSubmersibleSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceCategory.java
index 8fe47694aa..ae68fca12a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceCategory.java
@@ -174,4 +174,10 @@ public enum PlatformSurfaceCategory implements Category
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformSurfaceCategory: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceDryCargoShipSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceDryCargoShipSubcategories.java
index 0387da4448..f9cb597564 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceDryCargoShipSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceDryCargoShipSubcategories.java
@@ -105,4 +105,10 @@ public enum PlatformSurfaceDryCargoShipSubcategories implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformSurfaceDryCargoShipSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceFishingVesselSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceFishingVesselSubcategories.java
index ce5907872a..59d4492d40 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceFishingVesselSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceFishingVesselSubcategories.java
@@ -101,4 +101,10 @@ public enum PlatformSurfaceFishingVesselSubcategories implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformSurfaceFishingVesselSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceOtherVesselsSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceOtherVesselsSubcategories.java
index 1bb812ea78..4d865ef062 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceOtherVesselsSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceOtherVesselsSubcategories.java
@@ -111,4 +111,10 @@ public enum PlatformSurfaceOtherVesselsSubcategories implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformSurfaceOtherVesselsSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePassengerVesselSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePassengerVesselSubcategories.java
index aeadd313a5..932d210a5f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePassengerVesselSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePassengerVesselSubcategories.java
@@ -101,4 +101,10 @@ public enum PlatformSurfacePassengerVesselSubcategories implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformSurfacePassengerVesselSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java
index 02eff228b2..a27645ebef 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java
@@ -99,4 +99,10 @@ public enum PlatformSurfacePrivateMotorboatSubcategories implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformSurfacePrivateMotorboatSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateSailboatSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateSailboatSubcategories.java
index c2cc79922a..cae5bc24d3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateSailboatSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateSailboatSubcategories.java
@@ -99,4 +99,10 @@ public enum PlatformSurfacePrivateSailboatSubcategories implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformSurfacePrivateSailboatSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceSupportVesselSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceSupportVesselSubcategories.java
index 63c0f2a592..c89c05788e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceSupportVesselSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceSupportVesselSubcategories.java
@@ -101,4 +101,10 @@ public enum PlatformSurfaceSupportVesselSubcategories implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformSurfaceSupportVesselSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceTankerSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceTankerSubcategories.java
index 764d195fa6..ced6b9cbf0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceTankerSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceTankerSubcategories.java
@@ -109,4 +109,10 @@ public enum PlatformSurfaceTankerSubcategories implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "PlatformSurfaceTankerSubcategories: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceAirGroundBurst.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceAirGroundBurst.java
index 1c94a02eda..146274f6d2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceAirGroundBurst.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceAirGroundBurst.java
@@ -93,4 +93,10 @@ public class PointObjectAppearanceAirGroundBurst extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "PointObjectAppearanceAirGroundBurst: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceBuildingRubble.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceBuildingRubble.java
index abec15cc6a..56e9eb0284 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceBuildingRubble.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceBuildingRubble.java
@@ -74,4 +74,10 @@ public class PointObjectAppearanceBuildingRubble extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "PointObjectAppearanceBuildingRubble: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceBuildingStructure.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceBuildingStructure.java
index 9daf4657d2..539c584eff 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceBuildingStructure.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceBuildingStructure.java
@@ -85,4 +85,10 @@ public class PointObjectAppearanceBuildingStructure extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "PointObjectAppearanceBuildingStructure: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceCrater.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceCrater.java
index c738af7c68..7bceec5302 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceCrater.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceCrater.java
@@ -89,4 +89,10 @@ public class PointObjectAppearanceCrater extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "PointObjectAppearanceCrater: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceDisturbedEarthRoad.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceDisturbedEarthRoad.java
index f54b32f788..83c53c2b60 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceDisturbedEarthRoad.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceDisturbedEarthRoad.java
@@ -85,4 +85,10 @@ public class PointObjectAppearanceDisturbedEarthRoad extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "PointObjectAppearanceDisturbedEarthRoad: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceLogCribAbatisEtAl.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceLogCribAbatisEtAl.java
index aa2cf21a0f..094206865c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceLogCribAbatisEtAl.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceLogCribAbatisEtAl.java
@@ -77,4 +77,10 @@ public class PointObjectAppearanceLogCribAbatisEtAl extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "PointObjectAppearanceLogCribAbatisEtAl: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearancePothole.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearancePothole.java
index dc9249b658..37f7c11051 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearancePothole.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearancePothole.java
@@ -81,4 +81,10 @@ public class PointObjectAppearancePothole extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "PointObjectAppearancePothole: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceRibbonBridge.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceRibbonBridge.java
index 9f37a570f0..6a9e362081 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceRibbonBridge.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceRibbonBridge.java
@@ -77,4 +77,10 @@ public class PointObjectAppearanceRibbonBridge extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "PointObjectAppearanceRibbonBridge: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceStationaryBridgeAndAVLB.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceStationaryBridgeAndAVLB.java
index 237a45bbea..f33befacad 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceStationaryBridgeAndAVLB.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceStationaryBridgeAndAVLB.java
@@ -74,4 +74,10 @@ public class PointObjectAppearanceStationaryBridgeAndAVLB extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "PointObjectAppearanceStationaryBridgeAndAVLB: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceTree.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceTree.java
index 820126658a..1f28050780 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceTree.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceTree.java
@@ -81,4 +81,10 @@ public class PointObjectAppearanceTree extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "PointObjectAppearanceTree: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RadioAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/RadioAppearance.java
index 6bd6df5c84..feebecac2e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RadioAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RadioAppearance.java
@@ -81,4 +81,10 @@ public class RadioAppearance extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "RadioAppearance: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RadioCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/RadioCapabilities.java
index b5a0e2569c..10a201cf0d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RadioCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RadioCapabilities.java
@@ -77,4 +77,10 @@ public class RadioCapabilities extends DisBitSet implements EntityCapabilities
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "RadioCapabilities: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RadioCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/RadioCategory.java
index 1783d64605..c91388ba96 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RadioCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RadioCategory.java
@@ -173,4 +173,10 @@ public enum RadioCategory implements Category
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "RadioCategory: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RadioSubcategory.java b/src-generated/edu/nps/moves/dis7/enumerations/RadioSubcategory.java
index 476f02645d..ab4bc4e442 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RadioSubcategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RadioSubcategory.java
@@ -196,4 +196,10 @@ public enum RadioSubcategory implements SubCategory
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "RadioSubcategory: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ReceiverReceiverState.java b/src-generated/edu/nps/moves/dis7/enumerations/ReceiverReceiverState.java
index e5ee6e6732..72cf4a1896 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ReceiverReceiverState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ReceiverReceiverState.java
@@ -80,4 +80,10 @@ public enum ReceiverReceiverState
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ReceiverReceiverState: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RecordQueryREventType.java b/src-generated/edu/nps/moves/dis7/enumerations/RecordQueryREventType.java
index 421d3ad733..34799b8b0c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RecordQueryREventType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RecordQueryREventType.java
@@ -78,4 +78,10 @@ public enum RecordQueryREventType
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "RecordQueryREventType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RecordREventType.java b/src-generated/edu/nps/moves/dis7/enumerations/RecordREventType.java
index e14b55d699..44d2915a21 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RecordREventType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RecordREventType.java
@@ -76,4 +76,10 @@ public enum RecordREventType
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "RecordREventType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RepairCompleteRepair.java b/src-generated/edu/nps/moves/dis7/enumerations/RepairCompleteRepair.java
index 4d77a08bb9..3711ac93cb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RepairCompleteRepair.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RepairCompleteRepair.java
@@ -242,4 +242,10 @@ public enum RepairCompleteRepair
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "RepairCompleteRepair: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RepairGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/RepairGroups.java
index 9e77cdf010..40e93bdbd7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RepairGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RepairGroups.java
@@ -109,4 +109,10 @@ public enum RepairGroups
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "RepairGroups: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RepairResponseRepairResult.java b/src-generated/edu/nps/moves/dis7/enumerations/RepairResponseRepairResult.java
index 48522bd53b..83b31c175f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RepairResponseRepairResult.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RepairResponseRepairResult.java
@@ -99,4 +99,10 @@ public enum RepairResponseRepairResult
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "RepairResponseRepairResult: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ReplyAmplification.java b/src-generated/edu/nps/moves/dis7/enumerations/ReplyAmplification.java
index e186519824..d7a515f3ef 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ReplyAmplification.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ReplyAmplification.java
@@ -97,4 +97,10 @@ public enum ReplyAmplification
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ReplyAmplification: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RequiredReliabilityService.java b/src-generated/edu/nps/moves/dis7/enumerations/RequiredReliabilityService.java
index d6a8d3a10b..e786debb47 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RequiredReliabilityService.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RequiredReliabilityService.java
@@ -93,4 +93,10 @@ public enum RequiredReliabilityService
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "RequiredReliabilityService: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Season.java b/src-generated/edu/nps/moves/dis7/enumerations/Season.java
index 6b1340c93e..e9e991d745 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Season.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Season.java
@@ -97,4 +97,10 @@ public enum Season
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "Season: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterAppearance.java
index ad141baa50..9a5cb3bd00 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterAppearance.java
@@ -145,4 +145,10 @@ public class SensorEmitterAppearance extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "SensorEmitterAppearance: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCapabilities.java
index 4d14209160..62aa252e4b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCapabilities.java
@@ -89,4 +89,10 @@ public class SensorEmitterCapabilities extends DisBitSet implements EntityCapabi
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "SensorEmitterCapabilities: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCategory.java
index 9ad9228a13..65c221f8d5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCategory.java
@@ -123,4 +123,10 @@ public enum SensorEmitterCategory implements Category
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SensorEmitterCategory: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorOnOffStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorOnOffStatus.java
index a7de380d89..b2ffeaff46 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorOnOffStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorOnOffStatus.java
@@ -93,4 +93,10 @@ public enum SensorOnOffStatus
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SensorOnOffStatus: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypeOtherActiveSensors.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypeOtherActiveSensors.java
index e00571f770..76cf4b7da0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypeOtherActiveSensors.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypeOtherActiveSensors.java
@@ -76,4 +76,10 @@ public enum SensorRecordSensorTypeOtherActiveSensors
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SensorRecordSensorTypeOtherActiveSensors: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypePassiveSensors.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypePassiveSensors.java
index b66a31f607..5c556bf3cf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypePassiveSensors.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypePassiveSensors.java
@@ -164,4 +164,10 @@ public enum SensorRecordSensorTypePassiveSensors
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SensorRecordSensorTypePassiveSensors: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorTypeSource.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorTypeSource.java
index e46f54b00e..01a8508aae 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorTypeSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorTypeSource.java
@@ -101,4 +101,10 @@ public enum SensorTypeSource
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SensorTypeSource: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPPreEntityIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPPreEntityIndicator.java
index 8131d147bd..c2297fc456 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPPreEntityIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPPreEntityIndicator.java
@@ -97,4 +97,10 @@ public enum SeparationVPPreEntityIndicator
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SeparationVPPreEntityIndicator: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPReasonforSeparation.java b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPReasonforSeparation.java
index aede7a0f97..f135efa2b9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPReasonforSeparation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPReasonforSeparation.java
@@ -95,4 +95,10 @@ public enum SeparationVPReasonforSeparation
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SeparationVPReasonforSeparation: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ServiceRequestServiceTypeRequested.java b/src-generated/edu/nps/moves/dis7/enumerations/ServiceRequestServiceTypeRequested.java
index 66d46052a7..8137630632 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ServiceRequestServiceTypeRequested.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ServiceRequestServiceTypeRequested.java
@@ -99,4 +99,10 @@ public enum ServiceRequestServiceTypeRequested
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "ServiceRequestServiceTypeRequested: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingClass.java b/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingClass.java
index 5745973476..ee85251df2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingClass.java
@@ -97,4 +97,10 @@ public enum SignalEncodingClass
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SignalEncodingClass: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingType.java b/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingType.java
index db220f2682..1b5bff6ef9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingType.java
@@ -98,4 +98,10 @@ public enum SignalEncodingType
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SignalEncodingType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SignalTDLType.java b/src-generated/edu/nps/moves/dis7/enumerations/SignalTDLType.java
index 9afc9dbd0d..b8e49f5486 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SignalTDLType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SignalTDLType.java
@@ -264,4 +264,10 @@ public enum SignalTDLType
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SignalTDLType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SignalUserProtocolIdentificationNumber.java b/src-generated/edu/nps/moves/dis7/enumerations/SignalUserProtocolIdentificationNumber.java
index 7d641a797e..8d16786c56 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SignalUserProtocolIdentificationNumber.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SignalUserProtocolIdentificationNumber.java
@@ -142,4 +142,10 @@ public enum SignalUserProtocolIdentificationNumber
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SignalUserProtocolIdentificationNumber: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SpacePlatformAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/SpacePlatformAppearance.java
index f0cabc91a6..bf773032b0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SpacePlatformAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpacePlatformAppearance.java
@@ -109,4 +109,10 @@ public class SpacePlatformAppearance extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "SpacePlatformAppearance: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SpacePlatformCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/SpacePlatformCapabilities.java
index bf122b9c3b..42d0f32af3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SpacePlatformCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpacePlatformCapabilities.java
@@ -93,4 +93,10 @@ public class SpacePlatformCapabilities extends DisBitSet implements EntityCapabi
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "SpacePlatformCapabilities: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java
index 8a529822ee..d2d511835f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java
@@ -103,4 +103,10 @@ public enum SpecificDimensionEnumerationsforAirAreaSize
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SpecificDimensionEnumerationsforAirAreaSize: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java
index 9b8460f46e..9cc598768e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java
@@ -103,4 +103,10 @@ public enum SpecificDimensionEnumerationsforLandAreaSize
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SpecificDimensionEnumerationsforLandAreaSize: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SpotChaffStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/SpotChaffStatus.java
index 6f1f96e391..ef76e9110a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SpotChaffStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpotChaffStatus.java
@@ -95,4 +95,10 @@ public enum SpotChaffStatus
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SpotChaffStatus: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeFrozenBehavior.java b/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeFrozenBehavior.java
index 84d263a559..fa74dddf61 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeFrozenBehavior.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeFrozenBehavior.java
@@ -85,4 +85,10 @@ public class StopFreezeFrozenBehavior extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "StopFreezeFrozenBehavior: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeReason.java b/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeReason.java
index 2d7b790335..4aff54ca5f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeReason.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeReason.java
@@ -107,4 +107,10 @@ public enum StopFreezeReason
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "StopFreezeReason: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory200Bird.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory200Bird.java
index 9717aa62d1..d2b4f64a79 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory200Bird.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory200Bird.java
@@ -143,4 +143,10 @@ public enum SubcategoriesforAirCategory200Bird implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SubcategoriesforAirCategory200Bird: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory201Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory201Insect.java
index 1dab496bcd..ea0e264d9a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory201Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory201Insect.java
@@ -107,4 +107,10 @@ public enum SubcategoriesforAirCategory201Insect implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SubcategoriesforAirCategory201Insect: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory202Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory202Mammal.java
index dfc69bdc95..c33f1860a8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory202Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory202Mammal.java
@@ -95,4 +95,10 @@ public enum SubcategoriesforAirCategory202Mammal implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SubcategoriesforAirCategory202Mammal: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory200Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory200Mammal.java
index 08d2ba9042..8d5eda9697 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory200Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory200Mammal.java
@@ -149,4 +149,10 @@ public enum SubcategoriesforLandCategory200Mammal implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SubcategoriesforLandCategory200Mammal: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory201Reptile.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory201Reptile.java
index 22321619ac..961b0db26f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory201Reptile.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory201Reptile.java
@@ -135,4 +135,10 @@ public enum SubcategoriesforLandCategory201Reptile implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SubcategoriesforLandCategory201Reptile: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory202Amphibian.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory202Amphibian.java
index aa1c1477ae..2c2b95cf35 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory202Amphibian.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory202Amphibian.java
@@ -97,4 +97,10 @@ public enum SubcategoriesforLandCategory202Amphibian implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SubcategoriesforLandCategory202Amphibian: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory203Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory203Insect.java
index e19314864b..7492b6f9b4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory203Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory203Insect.java
@@ -103,4 +103,10 @@ public enum SubcategoriesforLandCategory203Insect implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SubcategoriesforLandCategory203Insect: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory204Arachnid.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory204Arachnid.java
index d31180b24f..0b3520090f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory204Arachnid.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory204Arachnid.java
@@ -99,4 +99,10 @@ public enum SubcategoriesforLandCategory204Arachnid implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SubcategoriesforLandCategory204Arachnid: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory205Mollusk.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory205Mollusk.java
index 7774795c1a..dc2c311d6d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory205Mollusk.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory205Mollusk.java
@@ -93,4 +93,10 @@ public enum SubcategoriesforLandCategory205Mollusk implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SubcategoriesforLandCategory205Mollusk: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory206Marsupial.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory206Marsupial.java
index ddb360bfc2..ad086933cc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory206Marsupial.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory206Marsupial.java
@@ -115,4 +115,10 @@ public enum SubcategoriesforLandCategory206Marsupial
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SubcategoriesforLandCategory206Marsupial: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java
index 53df750d60..0f8c98c651 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java
@@ -143,4 +143,10 @@ public enum SubcategoriesforSubsurfaceCategory200Fish implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SubcategoriesforSubsurfaceCategory200Fish: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java
index b448629757..0ad746b990 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java
@@ -207,4 +207,10 @@ public enum SubcategoriesforSubsurfaceCategory201Mammal implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SubcategoriesforSubsurfaceCategory201Mammal: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java
index 5085f88574..7d406d14fb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java
@@ -107,4 +107,10 @@ public enum SubcategoriesforSubsurfaceCategory202Mollusk implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SubcategoriesforSubsurfaceCategory202Mollusk: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java
index bc98d80dd9..5f9d7c1a12 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java
@@ -99,4 +99,10 @@ public enum SubcategoriesforSubsurfaceCategory203Crustacean implements SubCatego
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SubcategoriesforSubsurfaceCategory203Crustacean: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java
index ad21e8b9e0..82b38a9871 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java
@@ -93,4 +93,10 @@ public enum SubcategoriesforSubsurfaceCategory204Insect implements SubCategory
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SubcategoriesforSubsurfaceCategory204Insect: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubsurfacePlatformAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/SubsurfacePlatformAppearance.java
index 8eed636f77..f7886d94a5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubsurfacePlatformAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubsurfacePlatformAppearance.java
@@ -117,4 +117,10 @@ public class SubsurfacePlatformAppearance extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "SubsurfacePlatformAppearance: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubsurfacePlatformCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/SubsurfacePlatformCapabilities.java
index d7a855e54d..0a25a10b39 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubsurfacePlatformCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubsurfacePlatformCapabilities.java
@@ -105,4 +105,10 @@ public class SubsurfacePlatformCapabilities extends DisBitSet implements EntityC
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "SubsurfacePlatformCapabilities: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SupplyAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/SupplyAppearance.java
index d6bc52b157..b61bd9926b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SupplyAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SupplyAppearance.java
@@ -105,4 +105,10 @@ public class SupplyAppearance extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "SupplyAppearance: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SupplyCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/SupplyCapabilities.java
index 95d01026ce..699be87af5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SupplyCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SupplyCapabilities.java
@@ -93,4 +93,10 @@ public class SupplyCapabilities extends DisBitSet implements EntityCapabilities
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "SupplyCapabilities: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SupplyDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/SupplyDomain.java
index cab5d1d094..2652519a13 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SupplyDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SupplyDomain.java
@@ -115,4 +115,10 @@ public enum SupplyDomain
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SupplyDomain: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SupplyFuelType.java b/src-generated/edu/nps/moves/dis7/enumerations/SupplyFuelType.java
index 13fad9b258..efc637f754 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SupplyFuelType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SupplyFuelType.java
@@ -113,4 +113,10 @@ public enum SupplyFuelType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SupplyFuelType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SurfacePlatformAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/SurfacePlatformAppearance.java
index 37a8a540f6..6796d0edfb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SurfacePlatformAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SurfacePlatformAppearance.java
@@ -125,4 +125,10 @@ public class SurfacePlatformAppearance extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "SurfacePlatformAppearance: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SurfacePlatformCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/SurfacePlatformCapabilities.java
index c8492db459..0f4ef516f1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SurfacePlatformCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SurfacePlatformCapabilities.java
@@ -105,4 +105,10 @@ public class SurfacePlatformCapabilities extends DisBitSet implements EntityCapa
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "SurfacePlatformCapabilities: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SurveillanceStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/SurveillanceStatus.java
index b918550dea..03b0b718c1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SurveillanceStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SurveillanceStatus.java
@@ -97,4 +97,10 @@ public enum SurveillanceStatus
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "SurveillanceStatus: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASBasicAdvancedIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASBasicAdvancedIndicator.java
index 5f053185aa..0d3c2b3fd0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASBasicAdvancedIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASBasicAdvancedIndicator.java
@@ -93,4 +93,10 @@ public enum TCASACASBasicAdvancedIndicator
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TCASACASBasicAdvancedIndicator: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASIndicator.java
index e81bcbde12..c72c7cf5be 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASIndicator.java
@@ -93,4 +93,10 @@ public enum TCASACASIndicator
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TCASACASIndicator: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASSoftwareVersion.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASSoftwareVersion.java
index 73c0640196..84c95d5b63 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASSoftwareVersion.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASSoftwareVersion.java
@@ -95,4 +95,10 @@ public enum TCASACASSoftwareVersion
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TCASACASSoftwareVersion: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASType.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASType.java
index d78f446d65..dc55209c78 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASType.java
@@ -95,4 +95,10 @@ public enum TCASACASType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TCASACASType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASIIIType.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASIIIType.java
index b34688b0a1..add821ba90 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASIIIType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASIIIType.java
@@ -93,4 +93,10 @@ public enum TCASIIIType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TCASIIIType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TILinkType.java b/src-generated/edu/nps/moves/dis7/enumerations/TILinkType.java
index 2834486ffc..949ac105ad 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TILinkType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TILinkType.java
@@ -100,4 +100,10 @@ public enum TILinkType
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TILinkType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TimeTypeSource.java b/src-generated/edu/nps/moves/dis7/enumerations/TimeTypeSource.java
index cc90ae90f5..02228952c1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TimeTypeSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TimeTypeSource.java
@@ -95,4 +95,10 @@ public enum TimeTypeSource
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TimeTypeSource: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransferControlTransferType.java b/src-generated/edu/nps/moves/dis7/enumerations/TransferControlTransferType.java
index ac813ee560..7adae86731 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransferControlTransferType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransferControlTransferType.java
@@ -111,4 +111,10 @@ public enum TransferControlTransferType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TransferControlTransferType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmissionIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmissionIndicator.java
index 231a54e880..8e4d68e193 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmissionIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmissionIndicator.java
@@ -97,4 +97,10 @@ public enum TransmissionIndicator
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TransmissionIndicator: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternReferenceSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternReferenceSystem.java
index b742ba9975..e7ea12b9d5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternReferenceSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternReferenceSystem.java
@@ -93,4 +93,10 @@ public enum TransmitterAntennaPatternReferenceSystem
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TransmitterAntennaPatternReferenceSystem: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternType.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternType.java
index 1e3ab03be5..6a053f70c6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternType.java
@@ -84,4 +84,10 @@ public enum TransmitterAntennaPatternType
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TransmitterAntennaPatternType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterCryptoSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterCryptoSystem.java
index 72b237c155..00e9c204be 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterCryptoSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterCryptoSystem.java
@@ -102,4 +102,10 @@ public enum TransmitterCryptoSystem
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TransmitterCryptoSystem: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeModulation.java
index 73683073e4..02de21f040 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeModulation.java
@@ -96,4 +96,10 @@ public enum TransmitterDetailAmplitudeModulation
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TransmitterDetailAmplitudeModulation: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeandAngleModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeandAngleModulation.java
index f5b3a1e49d..16d8167a0d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeandAngleModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeandAngleModulation.java
@@ -78,4 +78,10 @@ public enum TransmitterDetailAmplitudeandAngleModulation
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TransmitterDetailAmplitudeandAngleModulation: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAnglemodulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAnglemodulation.java
index 5e08fab241..54c90edd46 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAnglemodulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAnglemodulation.java
@@ -82,4 +82,10 @@ public enum TransmitterDetailAnglemodulation
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TransmitterDetailAnglemodulation: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCarrierPhaseShiftModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCarrierPhaseShiftModulation.java
index 23990f7774..c1b2bc7810 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCarrierPhaseShiftModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCarrierPhaseShiftModulation.java
@@ -76,4 +76,10 @@ public enum TransmitterDetailCarrierPhaseShiftModulation
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TransmitterDetailCarrierPhaseShiftModulation: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCombinationModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCombinationModulation.java
index 589b46b70c..fc16c786a2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCombinationModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCombinationModulation.java
@@ -78,4 +78,10 @@ public enum TransmitterDetailCombinationModulation
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TransmitterDetailCombinationModulation: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailPulseModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailPulseModulation.java
index 5f7e6fd8b6..5f4b074379 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailPulseModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailPulseModulation.java
@@ -82,4 +82,10 @@ public enum TransmitterDetailPulseModulation
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TransmitterDetailPulseModulation: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailSATCOMModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailSATCOMModulation.java
index 885fca7a64..9d4c5e73e8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailSATCOMModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailSATCOMModulation.java
@@ -78,4 +78,10 @@ public enum TransmitterDetailSATCOMModulation
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TransmitterDetailSATCOMModulation: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailUnmodulatedModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailUnmodulatedModulation.java
index 128133de11..824fbe1a20 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailUnmodulatedModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailUnmodulatedModulation.java
@@ -78,4 +78,10 @@ public enum TransmitterDetailUnmodulatedModulation
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TransmitterDetailUnmodulatedModulation: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterInputSource.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterInputSource.java
index da7a8df8a9..b9d67d5bd3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterInputSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterInputSource.java
@@ -119,4 +119,10 @@ public enum TransmitterInputSource
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TransmitterInputSource: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterMajorModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterMajorModulation.java
index bd90f995ba..cd3f22616d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterMajorModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterMajorModulation.java
@@ -84,4 +84,10 @@ public enum TransmitterMajorModulation
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TransmitterMajorModulation: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterModulationTypeSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterModulationTypeSystem.java
index d2c315df8c..c81ef5ffda 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterModulationTypeSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterModulationTypeSystem.java
@@ -102,4 +102,10 @@ public enum TransmitterModulationTypeSystem
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TransmitterModulationTypeSystem: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterTransmitState.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterTransmitState.java
index b6eb16f28e..45e1d60797 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterTransmitState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterTransmitState.java
@@ -95,4 +95,10 @@ public enum TransmitterTransmitState
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TransmitterTransmitState: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransponderInterrogatorIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TransponderInterrogatorIndicator.java
index 07420224ff..493dd16920 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransponderInterrogatorIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransponderInterrogatorIndicator.java
@@ -93,4 +93,10 @@ public enum TransponderInterrogatorIndicator
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TransponderInterrogatorIndicator: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TurnRateSource.java b/src-generated/edu/nps/moves/dis7/enumerations/TurnRateSource.java
index 4aeea830df..79303f5c79 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TurnRateSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TurnRateSource.java
@@ -95,4 +95,10 @@ public enum TurnRateSource
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "TurnRateSource: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticEmitterSystemFunction.java b/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticEmitterSystemFunction.java
index d122000f83..7b37001460 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticEmitterSystemFunction.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticEmitterSystemFunction.java
@@ -99,4 +99,10 @@ public enum UAAcousticEmitterSystemFunction
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "UAAcousticEmitterSystemFunction: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticSystemName.java b/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticSystemName.java
index ae3f61941d..b06ae652e6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticSystemName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticSystemName.java
@@ -94,4 +94,10 @@ public enum UAAcousticSystemName
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "UAAcousticSystemName: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAActiveEmissionParameterIndex.java b/src-generated/edu/nps/moves/dis7/enumerations/UAActiveEmissionParameterIndex.java
index a6505e06d1..eafe90f6e0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAActiveEmissionParameterIndex.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAActiveEmissionParameterIndex.java
@@ -76,4 +76,10 @@ public enum UAActiveEmissionParameterIndex
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "UAActiveEmissionParameterIndex: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAAdditionalPassiveActivityParameterIndex.java b/src-generated/edu/nps/moves/dis7/enumerations/UAAdditionalPassiveActivityParameterIndex.java
index 1bea632e2e..599a03654c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAAdditionalPassiveActivityParameterIndex.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAAdditionalPassiveActivityParameterIndex.java
@@ -76,4 +76,10 @@ public enum UAAdditionalPassiveActivityParameterIndex
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "UAAdditionalPassiveActivityParameterIndex: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAPassiveParameterIndex.java b/src-generated/edu/nps/moves/dis7/enumerations/UAPassiveParameterIndex.java
index fb1a262edf..633e5752af 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAPassiveParameterIndex.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAPassiveParameterIndex.java
@@ -76,4 +76,10 @@ public enum UAPassiveParameterIndex
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "UAPassiveParameterIndex: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfiguration.java b/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfiguration.java
index 0e162d4d30..e1e218e843 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfiguration.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfiguration.java
@@ -81,4 +81,10 @@ public class UAPropulsionPlantConfiguration extends DisBitSet
       setbits(start,length,val);
       return this;
   }
+  
+  @Override
+  public String toString()
+  {
+      return "UAPropulsionPlantConfiguration: " + super.toString();
+  }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfigurationConfiguration.java b/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfigurationConfiguration.java
index 20f10fbc77..881986d7e1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfigurationConfiguration.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfigurationConfiguration.java
@@ -103,4 +103,10 @@ public enum UAPropulsionPlantConfigurationConfiguration
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "UAPropulsionPlantConfigurationConfiguration: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAScanPattern.java b/src-generated/edu/nps/moves/dis7/enumerations/UAScanPattern.java
index 32c9aa3c01..b20e96dfc8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAScanPattern.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAScanPattern.java
@@ -86,4 +86,10 @@ public enum UAScanPattern
     {
         return 2; // 16 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "UAScanPattern: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAStateChangeUpdateIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/UAStateChangeUpdateIndicator.java
index 61c5bc2e6f..db1c0965c1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAStateChangeUpdateIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAStateChangeUpdateIndicator.java
@@ -93,4 +93,10 @@ public enum UAStateChangeUpdateIndicator
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "UAStateChangeUpdateIndicator: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/VariableParameterRecordType.java b/src-generated/edu/nps/moves/dis7/enumerations/VariableParameterRecordType.java
index 48e90d2b93..8c9245d6ee 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/VariableParameterRecordType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariableParameterRecordType.java
@@ -99,4 +99,10 @@ public enum VariableParameterRecordType
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "VariableParameterRecordType: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/VariableRecordType.java b/src-generated/edu/nps/moves/dis7/enumerations/VariableRecordType.java
index 189e09a9c4..59f43f8a2e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/VariableRecordType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariableRecordType.java
@@ -2387,4 +2387,10 @@ public enum VariableRecordType
     {
         return 4; // 32 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "VariableRecordType: " + name() + ": " + getValue();
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforAirCategory200Bird.java b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforAirCategory200Bird.java
index 86c2848b86..78a5a688bb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforAirCategory200Bird.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforAirCategory200Bird.java
@@ -97,4 +97,10 @@ public enum VariantsforAirCategory200Bird
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "VariantsforAirCategory200Bird: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java
index 1105887358..84804620e8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java
@@ -99,4 +99,10 @@ public enum VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids: " + name() + ": " + getValue(); 
+    }
 }
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforSubsurfaceCategory201Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforSubsurfaceCategory201Mammal.java
index 1250c43c83..6e2b51c91b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforSubsurfaceCategory201Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforSubsurfaceCategory201Mammal.java
@@ -93,4 +93,10 @@ public enum VariantsforSubsurfaceCategory201Mammal
     {
         return 1; // 8 bits
     }
+    
+    @Override
+    public String toString()
+    {
+        return "VariantsforSubsurfaceCategory201Mammal: " + name() + ": " + getValue(); 
+    }
 }
-- 
GitLab