@dnv-plant/typescriptpws 1.0.97 → 1.0.98-alpha.2397542

package/src/entities.ts

@@ -1,15 +1,19 @@
-/***********************************************************************
- * This file has been auto-generated by a code generation tool.
- *
- * DO NOT MODIFY THIS FILE
- * This file is maintained by DNV.
- * Editing it may lead to inconsistent results and limit DNV's ability to provide support.
- * Please contact DNV if you believe changes are required.
- *
- * Version:   1.0.97
- * Date/time: 13 Apr 2026 17:02:52
- * Template:  templates/typescriptpws/entities.razor.
- ***********************************************************************/
+// ************************************************************************************
+// *
+// *  This file has been auto-generated by a code generation tool.
+// *
+// *  DO NOT MODIFY THIS FILE
+// *  This file is maintained by DNV.
+// *  Editing it may lead to inconsistent results and limit DNV's ability to provide support.
+// *  Please contact DNV if you believe changes are required.
+// *
+// *  API version:      1.0.
+// *  MDE version:      9.3.8211.
+// *  Package version:  1.0.98
+// *  Date/time:        23 Jun 2026 12:11:11.
+// *  Template:         TYPE_SCRIPT_PWS/entities.sbn.
+// *
+// ************************************************************************************
 
 import * as Enums from './enums';
 
@@ -23,6 +27,18 @@ class EntityBase {
     this.typeId = typeId;
     this.displayName = displayName;
   }
+
+  /**
+   * Getter for Id property (PascalCase for REST API compatibility).
+   */
+  get Id(): string | undefined {
+    return this.id;
+  }
+
+  set Id(value: string | undefined) {
+    this.id = value;
+  }
+
   /**
    * Base class for all entities.
    */
@@ -30,6 +46,9 @@ class EntityBase {
     if (data.id !== undefined && typeof data.id === 'string') {
       this.id = data.id as string;
     }
+    if (data.Id !== undefined && typeof data.Id === 'string') {
+      this.id = data.Id as string;
+    }
     if (data.typeId !== undefined && typeof data.typeId === 'string') {
       this.typeId = data.typeId as string;
     }
@@ -48,7 +67,6 @@ export class LocalPosition extends EntityBase {
   x: number;
   y: number;
   z: number;
-
   /**
    * Position with reference to some arbitrary local origin and axes.
    *
@@ -86,7 +104,6 @@ export class LocalPosition extends EntityBase {
 
 export class Asset extends EntityBase {
   location: LocalPosition;
-
   /**
    * Any equipment to be modeled, vessels, pipelines.
    *
@@ -116,12 +133,11 @@ export class Asset extends EntityBase {
 export class MaterialComponent extends EntityBase {
   name: string;
   moleFraction: number;
-
   /**
    * Constituent component of a material.
    *
    * @param {Object} options - Initialisation options
-   * @param {string} options.name - Name of the component. (default value is "")
+   * @param {string} options.name - Name of the component.
    * @param {number} options.moleFraction - Mole fraction of the component in the material. [fraction] (default value is 1)
    */
   constructor(options?: { id?: string; typeId?: string; displayName?: string; name?: string; moleFraction?: number }) {
@@ -149,30 +165,35 @@ export class MaterialComponent extends EntityBase {
 
 export class Material extends EntityBase {
   name: string;
-  components: MaterialComponent[];
   componentCount: number;
+  components: MaterialComponent[];
   propertyTemplate?: Enums.PropertyTemplate;
-
   /**
    * The material to use in calculations.
    *
    * @param {Object} options - Initialisation options
    * @param {string} options.name - Name of the material.
-   * @param {MaterialComponent[]} options.components - Constituent components.
    * @param {number} options.componentCount - Number of components in the material. (default value is 1)
+   * @param {MaterialComponent[]} options.components - Constituent components.
    * @param {Enums.PropertyTemplate} options.propertyTemplate - The template to be used for the selection of calculation methods for material properties. (default value is Enums.PropertyTemplate.PHAST_MC)
    */
-  constructor(options?: { id?: string; typeId?: string; displayName?: string; name?: string; components?: MaterialComponent[]; componentCount?: number; propertyTemplate?: Enums.PropertyTemplate }) {
+  constructor(options?: { id?: string; typeId?: string; displayName?: string; name?: string; componentCount?: number; components?: MaterialComponent[]; propertyTemplate?: Enums.PropertyTemplate }) {
     super(options?.id, options?.typeId, options?.displayName);
-    this.components = options?.components ?? [new MaterialComponent()];
     this.name = options?.name ?? '';
     this.componentCount = options?.componentCount ?? 1;
+    this.components = options?.components ?? [new MaterialComponent()];
     this.propertyTemplate = options?.propertyTemplate ?? Enums.PropertyTemplate.PHAST_MC;
   }
 
   /** Initialise the entity with data from a dictionary. */
   initialiseFromDictionary(data: { [key: string]: unknown }) {
     super.initialiseFromDictionary(data);
+    if (data.name !== undefined && typeof data.name === 'string') {
+      this.name = data.name as string;
+    }
+    if (data.componentCount !== undefined && typeof data.componentCount === 'number') {
+      this.componentCount = data.componentCount as number;
+    }
     if (data.components && Array.isArray(data.components)) {
       this.components = data.components.map((item) => {
         const record = new MaterialComponent();
@@ -180,18 +201,12 @@ export class Material extends EntityBase {
         return record;
       });
     }
-    if (data.name !== undefined && typeof data.name === 'string') {
-      this.name = data.name as string;
-    }
-    if (data.componentCount !== undefined && typeof data.componentCount === 'number') {
-      this.componentCount = data.componentCount as number;
-    }
     if (data.propertyTemplate !== undefined && (typeof data.propertyTemplate === 'string' || typeof data.propertyTemplate === 'number')) {
       this.propertyTemplate = this.parseEnumValue(data.propertyTemplate, Enums.PropertyTemplate);
     }
   }
 
-  private parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
+  protected parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
     if (typeof value === 'string' && value in enumType) {
       return enumType[value as keyof T];
     } else if (typeof value === 'number' && Object.values(enumType).includes(value)) {
@@ -204,9 +219,9 @@ export class Material extends EntityBase {
     const parts = [
       super.toString(),
       '* Material',
-      this.components?.map((item) => item?.toString()).join('\n'),
       `name:    ${this.name}`,
       `componentCount:    ${this.componentCount}`,
+      this.components?.map((item) => item?.toString()).join('\n'),
       `propertyTemplate:    ${this.propertyTemplate}`,
     ];
     return parts.join('\n');
@@ -219,7 +234,6 @@ export class State extends EntityBase {
   liquidFraction?: number;
   flashFlag?: Enums.FluidSpec;
   mixtureModelling?: Enums.MixtureModelling;
-
   /**
    * Description of the fluid state.
    *
@@ -268,7 +282,7 @@ export class State extends EntityBase {
     }
   }
 
-  private parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
+  protected parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
     if (typeof value === 'string' && value in enumType) {
       return enumType[value as keyof T];
     } else if (typeof value === 'number' && Object.values(enumType).includes(value)) {
@@ -297,7 +311,6 @@ export class AtmosphericStorageTank extends Asset {
   height?: number;
   material: Material;
   liquidFillFractionByVolume: number;
-
   /**
    * An atmospheric storage tank asset to model events that involve releases from unpressurised containment.
    *
@@ -388,7 +401,6 @@ export class Scenario extends EntityBase {
 export class ReleaseOverTime extends Scenario {
   releaseAngle: number;
   timeVaryingOption?: Enums.TimeVaryingOption;
-
   /**
    * Scenario representing a release over time.
    *
@@ -413,7 +425,7 @@ export class ReleaseOverTime extends Scenario {
     }
   }
 
-  private parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
+  protected parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
     if (typeof value === 'string' && value in enumType) {
       return enumType[value as keyof T];
     } else if (typeof value === 'number' && Object.values(enumType).includes(value)) {
@@ -430,35 +442,34 @@ export class ReleaseOverTime extends Scenario {
 
 export class BESSRelease extends ReleaseOverTime {
   height?: number;
-  area?: number;
+  ventArea?: number;
   temperature?: number;
   duration?: number;
-
   /**
    * A release from a BESS unit in thermal runaway.
    *
    * @param {Object} options - Initialisation options
+   * @param {number} options.releaseAngle - Angle of release above a horizontal plane. [rad] (default value is 0.0)
+   * @param {Enums.TimeVaryingOption} options.timeVaryingOption - Whether the release is a time-varying release or a steady state release using the initial rate. (default value is Enums.TimeVaryingOption.INITIAL_RATE)
    * @param {number} options.height - The height from which the release occurs. [m]
-   * @param {number} options.area - The area over which the release occurs. [m2]
+   * @param {number} options.ventArea - The area over which the release occurs. [m2]
    * @param {number} options.temperature - The exit temperature of the release (from the BESS unit). [K]
    * @param {number} options.duration - The duration of the release. [s]
-   * @param {number} options.releaseAngle - Angle of release above a horizontal plane. [rad] (default value is 0.0)
-   * @param {Enums.TimeVaryingOption} options.timeVaryingOption - Whether the release is a time-varying release or a steady state release using the initial rate. (default value is Enums.TimeVaryingOption.INITIAL_RATE)
    */
   constructor(options?: {
     id?: string;
     typeId?: string;
     displayName?: string;
+    releaseAngle?: number;
+    timeVaryingOption?: Enums.TimeVaryingOption;
     height?: number;
-    area?: number;
+    ventArea?: number;
     temperature?: number;
     duration?: number;
-    releaseAngle?: number;
-    timeVaryingOption?: Enums.TimeVaryingOption;
   }) {
     super(options);
     this.height = options?.height;
-    this.area = options?.area;
+    this.ventArea = options?.ventArea;
     this.temperature = options?.temperature;
     this.duration = options?.duration;
   }
@@ -469,8 +480,8 @@ export class BESSRelease extends ReleaseOverTime {
     if (data.height !== undefined && typeof data.height === 'number') {
       this.height = data.height as number;
     }
-    if (data.area !== undefined && typeof data.area === 'number') {
-      this.area = data.area as number;
+    if (data.ventArea !== undefined && typeof data.ventArea === 'number') {
+      this.ventArea = data.ventArea as number;
     }
     if (data.temperature !== undefined && typeof data.temperature === 'number') {
       this.temperature = data.temperature as number;
@@ -484,12 +495,44 @@ export class BESSRelease extends ReleaseOverTime {
     const parts = [
       super.toString(),
       '* BESSRelease',
+      `releaseAngle:    ${this.releaseAngle}`,
+      `timeVaryingOption:    ${this.timeVaryingOption}`,
       `height:    ${this.height}`,
-      `area:    ${this.area}`,
+      `ventArea:    ${this.ventArea}`,
       `temperature:    ${this.temperature}`,
       `duration:    ${this.duration}`,
-      `releaseAngle:    ${this.releaseAngle}`,
-      `timeVaryingOption:    ${this.timeVaryingOption}`,
+    ];
+    return parts.join('\n');
+  }
+}
+
+export class OffGasComposition extends Material {
+  /**
+   * The off-gas composition to use in calculations.
+   *
+   * @param {Object} options - Initialisation options
+   * @param {string} options.name - Name of the material.
+   * @param {number} options.componentCount - Number of components in the material. (default value is 1)
+   * @param {MaterialComponent[]} options.components - Constituent components.
+   * @param {Enums.PropertyTemplate} options.propertyTemplate - The template to be used for the selection of calculation methods for material properties. (default value is Enums.PropertyTemplate.PHAST_MC)
+   */
+  constructor(options?: { id?: string; typeId?: string; displayName?: string; name?: string; componentCount?: number; components?: MaterialComponent[]; propertyTemplate?: Enums.PropertyTemplate }) {
+    super(options);
+  }
+
+  /** Initialise the entity with data from a dictionary. */
+  initialiseFromDictionary(data: { [key: string]: unknown }) {
+    super.initialiseFromDictionary(data);
+  }
+
+  toString() {
+    const parts = [
+      super.toString(),
+      '* OffGasComposition',
+      `name:    ${this.name}`,
+      `componentCount:    ${this.componentCount}`,
+      this.components?.map((item) => item?.toString()).join('\n'),
+      `propertyTemplate:    ${this.propertyTemplate}`,
     ];
     return parts.join('\n');
   }
@@ -498,7 +541,8 @@ export class BESSRelease extends ReleaseOverTime {
 export class BESSUnit extends Asset {
   energyCapacity?: number;
   chemistry?: Enums.BESSChemistry;
-
+  offGasComposition: OffGasComposition;
+  offGasVolume: number;
   /**
    * A BESS unit, containing Li-ion betteries.
    *
@@ -506,11 +550,24 @@ export class BESSUnit extends Asset {
    * @param {LocalPosition} options.location - Location of the asset.
    * @param {number} options.energyCapacity - The energy capacity of the installation. [J]
    * @param {Enums.BESSChemistry} options.chemistry - The chemistry type of the BESS unit. (default value is Enums.BESSChemistry.LFP)
+   * @param {OffGasComposition} options.offGasComposition - The composition representing the off-gas.
+   * @param {number} options.offGasVolume - The user-defined volume of off-gas for the scenario. (default value is 0)
    */
-  constructor(options?: { id?: string; typeId?: string; displayName?: string; location?: LocalPosition; energyCapacity?: number; chemistry?: Enums.BESSChemistry }) {
+  constructor(options?: {
+    id?: string;
+    typeId?: string;
+    displayName?: string;
+    location?: LocalPosition;
+    energyCapacity?: number;
+    chemistry?: Enums.BESSChemistry;
+    offGasComposition?: OffGasComposition;
+    offGasVolume?: number;
+  }) {
     super(options);
     this.energyCapacity = options?.energyCapacity;
     this.chemistry = options?.chemistry ?? Enums.BESSChemistry.LFP;
+    this.offGasComposition = options?.offGasComposition ?? new OffGasComposition();
+    this.offGasVolume = options?.offGasVolume ?? 0;
   }
 
   /** Initialise the entity with data from a dictionary. */
@@ -522,9 +579,16 @@ export class BESSUnit extends Asset {
     if (data.chemistry !== undefined && (typeof data.chemistry === 'string' || typeof data.chemistry === 'number')) {
       this.chemistry = this.parseEnumValue(data.chemistry, Enums.BESSChemistry);
     }
+    if (data.offGasComposition) {
+      this.offGasComposition = new OffGasComposition();
+      this.offGasComposition.initialiseFromDictionary(data.offGasComposition as { [key: string]: unknown });
+    }
+    if (data.offGasVolume !== undefined && typeof data.offGasVolume === 'number') {
+      this.offGasVolume = data.offGasVolume as number;
+    }
   }
 
-  private parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
+  protected parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
     if (typeof value === 'string' && value in enumType) {
       return enumType[value as keyof T];
     } else if (typeof value === 'number' && Object.values(enumType).includes(value)) {
@@ -534,7 +598,60 @@ export class BESSUnit extends Asset {
   }
 
   toString() {
-    const parts = [super.toString(), '* BESSUnit', `location:    ${this.location?.toString()}`, `energyCapacity:    ${this.energyCapacity}`, `chemistry:    ${this.chemistry}`];
+    const parts = [
+      super.toString(),
+      '* BESSUnit',
+      `location:    ${this.location?.toString()}`,
+      `energyCapacity:    ${this.energyCapacity}`,
+      `chemistry:    ${this.chemistry}`,
+      `offGasComposition:    ${this.offGasComposition?.toString()}`,
+      `offGasVolume:    ${this.offGasVolume}`,
+    ];
+    return parts.join('\n');
+  }
+}
+
+export class BESSVolume extends EntityBase {
+  volume: number;
+  isEstimate: boolean;
+  upperCI: number;
+  lowerCI: number;
+  /**
+   * Represents the off-gas volume for a calculation.
+   *
+   * @param {Object} options - Initialisation options
+   * @param {number} options.volume - Off gas volume in m3. (default value is 0)
+   * @param {boolean} options.isEstimate - Indicates whether the volume is an estimate or user-defined. (default value is true)
+   * @param {number} options.upperCI - upper 95% confidence interval for an estimated volume. (default value is 0)
+   * @param {number} options.lowerCI - lower confidence interval for an estimated volume. (default value is 0)
+   */
+  constructor(options?: { id?: string; typeId?: string; displayName?: string; volume?: number; isEstimate?: boolean; upperCI?: number; lowerCI?: number }) {
+    super(options?.id, options?.typeId, options?.displayName);
+    this.volume = options?.volume ?? 0;
+    this.isEstimate = options?.isEstimate ?? true;
+    this.upperCI = options?.upperCI ?? 0;
+    this.lowerCI = options?.lowerCI ?? 0;
+  }
+
+  /** Initialise the entity with data from a dictionary. */
+  initialiseFromDictionary(data: { [key: string]: unknown }) {
+    super.initialiseFromDictionary(data);
+    if (data.volume !== undefined && typeof data.volume === 'number') {
+      this.volume = data.volume as number;
+    }
+    if (data.isEstimate !== undefined && typeof data.isEstimate === 'boolean') {
+      this.isEstimate = data.isEstimate as boolean;
+    }
+    if (data.upperCI !== undefined && typeof data.upperCI === 'number') {
+      this.upperCI = data.upperCI as number;
+    }
+    if (data.lowerCI !== undefined && typeof data.lowerCI === 'number') {
+      this.lowerCI = data.lowerCI as number;
+    }
+  }
+
+  toString() {
+    const parts = [super.toString(), '* BESSVolume', `volume:    ${this.volume}`, `isEstimate:    ${this.isEstimate}`, `upperCI:    ${this.upperCI}`, `lowerCI:    ${this.lowerCI}`];
     return parts.join('\n');
   }
 }
@@ -543,14 +660,13 @@ export class Bund extends EntityBase {
   bundHeight: number;
   bundDiameter: number;
   specifyBund: boolean;
-
   /**
    * A bund entity used in the modelling of pool spreading and vaporisation.
    *
    * @param {Object} options - Initialisation options
    * @param {number} options.bundHeight - Used in calculating the volume of the bund and in modelling bund failure and the location of rainout. [m] (default value is 0.0)
    * @param {number} options.bundDiameter - The diameter of the (circular) bund. [m] (default value is 0.0)
-   * @param {boolean} options.specifyBund - Whether to model the effect of a bund on the spreading of a liquid pool. (default value is false)
+   * @param {boolean} options.specifyBund - Whether to model the effect of a bund on the spreading of a liquid pool. (default value is False)
    */
   constructor(options?: { id?: string; typeId?: string; displayName?: string; bundHeight?: number; bundDiameter?: number; specifyBund?: boolean }) {
     super(options?.id, options?.typeId, options?.displayName);
@@ -600,21 +716,34 @@ export class Instantaneous extends Scenario {
 }
 
 export class CatastrophicRupture extends Instantaneous {
+  useVesselBurstPressure: boolean;
+  vesselBurstPressure: number;
   /**
    * An instanaeous release of the entire inventory of an associated vessel, intended to model an incident in which the vessel is destroyed by an impact, a crack, or some other failure which propagates very quickly.
    *
+   * @param {Object} options - Initialisation options
+   * @param {boolean} options.useVesselBurstPressure - Flag to control the use of vessel burst pressure. (default value is false)
+   * @param {number} options.vesselBurstPressure - Vessel burst pressure. [N/m2] (default value is 101325)
    */
-  constructor(options?: { id?: string; typeId?: string; displayName?: string }) {
+  constructor(options?: { id?: string; typeId?: string; displayName?: string; useVesselBurstPressure?: boolean; vesselBurstPressure?: number }) {
     super(options);
+    this.useVesselBurstPressure = options?.useVesselBurstPressure ?? false;
+    this.vesselBurstPressure = options?.vesselBurstPressure ?? 101325;
   }
 
   /** Initialise the entity with data from a dictionary. */
   initialiseFromDictionary(data: { [key: string]: unknown }) {
     super.initialiseFromDictionary(data);
+    if (data.useVesselBurstPressure !== undefined && typeof data.useVesselBurstPressure === 'boolean') {
+      this.useVesselBurstPressure = data.useVesselBurstPressure as boolean;
+    }
+    if (data.vesselBurstPressure !== undefined && typeof data.vesselBurstPressure === 'number') {
+      this.vesselBurstPressure = data.vesselBurstPressure as number;
+    }
   }
 
   toString() {
-    const parts = [super.toString(), '* CatastrophicRupture'];
+    const parts = [super.toString(), '* CatastrophicRupture', `useVesselBurstPressure:    ${this.useVesselBurstPressure}`, `vesselBurstPressure:    ${this.vesselBurstPressure}`];
     return parts.join('\n');
   }
 }
@@ -622,7 +751,6 @@ export class CatastrophicRupture extends Instantaneous {
 export class ConcentrationRecord extends EntityBase {
   concentration?: number;
   position: LocalPosition;
-
   /**
    * A record containing the cloud concentration at a specified x, y, z position.
    *
@@ -658,7 +786,6 @@ export class ConstantMaterialResult extends EntityBase {
   criticalPressure?: number;
   criticalTemperature?: number;
   totalMolecularWeight?: number;
-
   /**
    * Constant material properties, i.e. critical pressure, temperature, molecular weight.
    *
@@ -702,16 +829,18 @@ export class ConstantMaterialResult extends EntityBase {
 
 export class DischargeParameters extends EntityBase {
   flashAtOrifice?: Enums.FlashAtOrifice;
-
+  maxReleaseDuration: number;
   /**
    * A set of parameters used in discharge calculations.
    *
    * @param {Object} options - Initialisation options
    * @param {Enums.FlashAtOrifice} options.flashAtOrifice - Whether discharge calculations should allow the phase to change between storage and orifice conditions. (default value is Enums.FlashAtOrifice.DISALLOW_LIQUID_FLASH)
+   * @param {number} options.maxReleaseDuration - Maximum release duration. [s] (default value is 3600)
    */
-  constructor(options?: { id?: string; typeId?: string; displayName?: string; flashAtOrifice?: Enums.FlashAtOrifice }) {
+  constructor(options?: { id?: string; typeId?: string; displayName?: string; flashAtOrifice?: Enums.FlashAtOrifice; maxReleaseDuration?: number }) {
     super(options?.id, options?.typeId, options?.displayName);
     this.flashAtOrifice = options?.flashAtOrifice ?? Enums.FlashAtOrifice.DISALLOW_LIQUID_FLASH;
+    this.maxReleaseDuration = options?.maxReleaseDuration ?? 3600;
   }
 
   /** Initialise the entity with data from a dictionary. */
@@ -720,9 +849,12 @@ export class DischargeParameters extends EntityBase {
     if (data.flashAtOrifice !== undefined && (typeof data.flashAtOrifice === 'string' || typeof data.flashAtOrifice === 'number')) {
       this.flashAtOrifice = this.parseEnumValue(data.flashAtOrifice, Enums.FlashAtOrifice);
     }
+    if (data.maxReleaseDuration !== undefined && typeof data.maxReleaseDuration === 'number') {
+      this.maxReleaseDuration = data.maxReleaseDuration as number;
+    }
   }
 
-  private parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
+  protected parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
     if (typeof value === 'string' && value in enumType) {
       return enumType[value as keyof T];
     } else if (typeof value === 'number' && Object.values(enumType).includes(value)) {
@@ -732,7 +864,7 @@ export class DischargeParameters extends EntityBase {
   }
 
   toString() {
-    const parts = [super.toString(), '* DischargeParameters', `flashAtOrifice:    ${this.flashAtOrifice}`];
+    const parts = [super.toString(), '* DischargeParameters', `flashAtOrifice:    ${this.flashAtOrifice}`, `maxReleaseDuration:    ${this.maxReleaseDuration}`];
     return parts.join('\n');
   }
 }
@@ -747,7 +879,6 @@ export class DischargeRecord extends EntityBase {
   storageState: State;
   dropletDiameter?: number;
   expandedDiameter: number;
-
   /**
    * A record containing discharge results at a given time.
    *
@@ -846,20 +977,19 @@ export class DischargeResult extends EntityBase {
   releaseMass?: number;
   height?: number;
   angle?: number;
-  holeDiameter?: number;
   releaseType?: Enums.DynamicType;
+  holeDiameter?: number;
   preDilutionAirRate: number;
-
   /**
    * A set of discharge results that do not vary with time.
    *
    * @param {Object} options - Initialisation options
-   * @param {number} options.expansionEnergy - The energy released when a pressurized substance, such as a liquid or vapor, is released following an instantaneous rupture. [J]
+   * @param {number} options.expansionEnergy - The energy released when a pressurized substance, such as a liquid or vapor, is released following an instantaneous rupture. . [J]
    * @param {number} options.releaseMass - Amount of mass released during the discharge. [kg]
    * @param {number} options.height - Release height above ground. [m]
    * @param {number} options.angle - Release angle (non-instantaneous releases only). [rad]
-   * @param {number} options.holeDiameter - Diameter of the hole. [m]
    * @param {Enums.DynamicType} options.releaseType - Instantaneous, continuous or time-varying. (default value is Enums.DynamicType.UNSET)
+   * @param {number} options.holeDiameter - Diameter of the hole. [m]
    * @param {number} options.preDilutionAirRate - The rate at which air at ambient conditions mixes with the released material before the cloud starts to move away from the point of release. [kg/s] (default value is 0)
    */
   constructor(options?: {
@@ -870,8 +1000,8 @@ export class DischargeResult extends EntityBase {
     releaseMass?: number;
     height?: number;
     angle?: number;
-    holeDiameter?: number;
     releaseType?: Enums.DynamicType;
+    holeDiameter?: number;
     preDilutionAirRate?: number;
   }) {
     super(options?.id, options?.typeId, options?.displayName);
@@ -879,8 +1009,8 @@ export class DischargeResult extends EntityBase {
     this.releaseMass = options?.releaseMass;
     this.height = options?.height;
     this.angle = options?.angle;
-    this.holeDiameter = options?.holeDiameter;
     this.releaseType = options?.releaseType ?? Enums.DynamicType.UNSET;
+    this.holeDiameter = options?.holeDiameter;
     this.preDilutionAirRate = options?.preDilutionAirRate ?? 0;
   }
 
@@ -899,18 +1029,18 @@ export class DischargeResult extends EntityBase {
     if (data.angle !== undefined && typeof data.angle === 'number') {
       this.angle = data.angle as number;
     }
-    if (data.holeDiameter !== undefined && typeof data.holeDiameter === 'number') {
-      this.holeDiameter = data.holeDiameter as number;
-    }
     if (data.releaseType !== undefined && (typeof data.releaseType === 'string' || typeof data.releaseType === 'number')) {
       this.releaseType = this.parseEnumValue(data.releaseType, Enums.DynamicType);
     }
+    if (data.holeDiameter !== undefined && typeof data.holeDiameter === 'number') {
+      this.holeDiameter = data.holeDiameter as number;
+    }
     if (data.preDilutionAirRate !== undefined && typeof data.preDilutionAirRate === 'number') {
       this.preDilutionAirRate = data.preDilutionAirRate as number;
     }
   }
 
-  private parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
+  protected parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
     if (typeof value === 'string' && value in enumType) {
       return enumType[value as keyof T];
     } else if (typeof value === 'number' && Object.values(enumType).includes(value)) {
@@ -927,8 +1057,8 @@ export class DischargeResult extends EntityBase {
       `releaseMass:    ${this.releaseMass}`,
       `height:    ${this.height}`,
       `angle:    ${this.angle}`,
-      `holeDiameter:    ${this.holeDiameter}`,
       `releaseType:    ${this.releaseType}`,
+      `holeDiameter:    ${this.holeDiameter}`,
       `preDilutionAirRate:    ${this.preDilutionAirRate}`,
     ];
     return parts.join('\n');
@@ -945,9 +1075,7 @@ export class DispersionOutputConfig extends EntityBase {
   crosswindDistance: number;
   contourType?: Enums.ContourType;
   lflFractionValue: number;
-  componentToTrackIndex: number;
   componentToTrackName: string;
-
   /**
    * Dispersion plotting and reporting parameters.
    *
@@ -961,7 +1089,6 @@ export class DispersionOutputConfig extends EntityBase {
    * @param {number} options.crosswindDistance - The distance that an XZ plane of interest is offset from the downwind direction (x-axis). [m] (default value is 0)
    * @param {Enums.ContourType} options.contourType - The type of contour on which the contour points will be based. (default value is Enums.ContourType.FOOTPRINT)
    * @param {number} options.lflFractionValue - Value of the lower flammable limit fraction, used when SpecialConcentration is set to Min or LflFraction. [fraction] (default value is 0.5)
-   * @param {number} options.componentToTrackIndex - Index of a component that you want to track within a mixture. (default value is -1)
    * @param {string} options.componentToTrackName - Name of the component to track.
    */
   constructor(options?: {
@@ -977,7 +1104,6 @@ export class DispersionOutputConfig extends EntityBase {
     crosswindDistance?: number;
     contourType?: Enums.ContourType;
     lflFractionValue?: number;
-    componentToTrackIndex?: number;
     componentToTrackName?: string;
   }) {
     super(options?.id, options?.typeId, options?.displayName);
@@ -990,7 +1116,6 @@ export class DispersionOutputConfig extends EntityBase {
     this.crosswindDistance = options?.crosswindDistance ?? 0;
     this.contourType = options?.contourType ?? Enums.ContourType.FOOTPRINT;
     this.lflFractionValue = options?.lflFractionValue ?? 0.5;
-    this.componentToTrackIndex = options?.componentToTrackIndex ?? -1;
     this.componentToTrackName = options?.componentToTrackName ?? '';
   }
 
@@ -1024,15 +1149,12 @@ export class DispersionOutputConfig extends EntityBase {
     if (data.lflFractionValue !== undefined && typeof data.lflFractionValue === 'number') {
       this.lflFractionValue = data.lflFractionValue as number;
     }
-    if (data.componentToTrackIndex !== undefined && typeof data.componentToTrackIndex === 'number') {
-      this.componentToTrackIndex = data.componentToTrackIndex as number;
-    }
     if (data.componentToTrackName !== undefined && typeof data.componentToTrackName === 'string') {
       this.componentToTrackName = data.componentToTrackName as string;
     }
   }
 
-  private parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
+  protected parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
     if (typeof value === 'string' && value in enumType) {
       return enumType[value as keyof T];
     } else if (typeof value === 'number' && Object.values(enumType).includes(value)) {
@@ -1054,7 +1176,6 @@ export class DispersionOutputConfig extends EntityBase {
       `crosswindDistance:    ${this.crosswindDistance}`,
       `contourType:    ${this.contourType}`,
       `lflFractionValue:    ${this.lflFractionValue}`,
-      `componentToTrackIndex:    ${this.componentToTrackIndex}`,
       `componentToTrackName:    ${this.componentToTrackName}`,
     ];
     return parts.join('\n');
@@ -1072,7 +1193,10 @@ export class DispersionParameters extends EntityBase {
   numberOfPoolObservers: number;
   averagingTime: number;
   lflFractionToStop: number;
-
+  maxReleaseDuration: number;
+  releaseAveragingMethod?: Enums.ReleaseAveragingMethod;
+  firstTimeForBetweenTwoTimes: number;
+  secondTimeForBetweenTwoTimes: number;
   /**
    * A set of parameters used in dispersion calculations.
    *
@@ -1082,11 +1206,15 @@ export class DispersionParameters extends EntityBase {
    * @param {number} options.fixedStepSize - The size of steps within the core dispersion calculations. [s] (default value is 0.01)
    * @param {number} options.outputStepMultiplier - Multiplier to increase each step size after the initial fixed steps. (default value is 1.2)
    * @param {number} options.maxDispersionDistance - The maximum dispersion distance that will be modelled. Modelling will stop at this distance even if the lowest concentration of interest has not been reached. [m] (default value is 50000)
-   * @param {number} options.maxDispersionHeight - The dispersion calculation will stop when this height is exceeded. This provides a means of preventing the calculation of dispersion of buoyant releases going too far above the ground. [m] (default value is 1000)
+   * @param {number} options.maxDispersionHeight - The dispersion calculation will stop when this height is exceeded. This provides a means of preventing the calculation of dispersion of buoyant releases going too far above the ground. . [m] (default value is 1000)
    * @param {number} options.numberOfReleaseObservers - Number of release observers for time-varying releases. (default value is 5)
    * @param {number} options.numberOfPoolObservers - Number of pool observers for rainout cases. (default value is 10)
    * @param {number} options.averagingTime - The core averaging time, used to take into account the effects of changes in the wind direction over the course of the release. [s] (default value is 18.75)
    * @param {number} options.lflFractionToStop - The LFL multipler, which determines the minimum concentration of interest for a flammable release. If the concentration of interest determined from the DispersionOutputConfig is lowest than this value, an error will occur. [fraction] (default value is 0.5)
+   * @param {number} options.maxReleaseDuration - Maximum duration of the release. [s] (default value is 3600)
+   * @param {Enums.ReleaseAveragingMethod} options.releaseAveragingMethod - Averaging method to determine the input to the dispersion. (default value is Enums.ReleaseAveragingMethod.UP_TO_TEN_RATES)
+   * @param {number} options.firstTimeForBetweenTwoTimes - Initial time for averaging between two rates. [s] (default value is 0)
+   * @param {number} options.secondTimeForBetweenTwoTimes - Final time for averaging between two rates. [s] (default value is 20)
    */
   constructor(options?: {
     id?: string;
@@ -1102,6 +1230,10 @@ export class DispersionParameters extends EntityBase {
     numberOfPoolObservers?: number;
     averagingTime?: number;
     lflFractionToStop?: number;
+    maxReleaseDuration?: number;
+    releaseAveragingMethod?: Enums.ReleaseAveragingMethod;
+    firstTimeForBetweenTwoTimes?: number;
+    secondTimeForBetweenTwoTimes?: number;
   }) {
     super(options?.id, options?.typeId, options?.displayName);
     this.relativeTolerance = options?.relativeTolerance ?? 0.0001;
@@ -1114,6 +1246,10 @@ export class DispersionParameters extends EntityBase {
     this.numberOfPoolObservers = options?.numberOfPoolObservers ?? 10;
     this.averagingTime = options?.averagingTime ?? 18.75;
     this.lflFractionToStop = options?.lflFractionToStop ?? 0.5;
+    this.maxReleaseDuration = options?.maxReleaseDuration ?? 3600;
+    this.releaseAveragingMethod = options?.releaseAveragingMethod ?? Enums.ReleaseAveragingMethod.UP_TO_TEN_RATES;
+    this.firstTimeForBetweenTwoTimes = options?.firstTimeForBetweenTwoTimes ?? 0;
+    this.secondTimeForBetweenTwoTimes = options?.secondTimeForBetweenTwoTimes ?? 20;
   }
 
   /** Initialise the entity with data from a dictionary. */
@@ -1149,9 +1285,21 @@ export class DispersionParameters extends EntityBase {
     if (data.lflFractionToStop !== undefined && typeof data.lflFractionToStop === 'number') {
       this.lflFractionToStop = data.lflFractionToStop as number;
     }
+    if (data.maxReleaseDuration !== undefined && typeof data.maxReleaseDuration === 'number') {
+      this.maxReleaseDuration = data.maxReleaseDuration as number;
+    }
+    if (data.releaseAveragingMethod !== undefined && (typeof data.releaseAveragingMethod === 'string' || typeof data.releaseAveragingMethod === 'number')) {
+      this.releaseAveragingMethod = this.parseEnumValue(data.releaseAveragingMethod, Enums.ReleaseAveragingMethod);
+    }
+    if (data.firstTimeForBetweenTwoTimes !== undefined && typeof data.firstTimeForBetweenTwoTimes === 'number') {
+      this.firstTimeForBetweenTwoTimes = data.firstTimeForBetweenTwoTimes as number;
+    }
+    if (data.secondTimeForBetweenTwoTimes !== undefined && typeof data.secondTimeForBetweenTwoTimes === 'number') {
+      this.secondTimeForBetweenTwoTimes = data.secondTimeForBetweenTwoTimes as number;
+    }
   }
 
-  private parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
+  protected parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
     if (typeof value === 'string' && value in enumType) {
       return enumType[value as keyof T];
     } else if (typeof value === 'number' && Object.values(enumType).includes(value)) {
@@ -1174,6 +1322,10 @@ export class DispersionParameters extends EntityBase {
       `numberOfPoolObservers:    ${this.numberOfPoolObservers}`,
       `averagingTime:    ${this.averagingTime}`,
       `lflFractionToStop:    ${this.lflFractionToStop}`,
+      `maxReleaseDuration:    ${this.maxReleaseDuration}`,
+      `releaseAveragingMethod:    ${this.releaseAveragingMethod}`,
+      `firstTimeForBetweenTwoTimes:    ${this.firstTimeForBetweenTwoTimes}`,
+      `secondTimeForBetweenTwoTimes:    ${this.secondTimeForBetweenTwoTimes}`,
     ];
     return parts.join('\n');
   }
@@ -1196,6 +1348,7 @@ export class DispersionRecord extends EntityBase {
   massConc?: number;
   velocity?: number;
   massFlow?: number;
+  instCon?: Enums.DynamicType;
   profileFlag?: number;
   elevFlag?: number;
   rhoCloud?: number;
@@ -1208,8 +1361,6 @@ export class DispersionRecord extends EntityBase {
   dropletHeight?: number;
   dropletDistance?: number;
   mass?: number;
-  instCon?: Enums.DynamicType;
-
   /**
    * A record containing observer dispersion results at a given time.
    *
@@ -1226,10 +1377,11 @@ export class DispersionRecord extends EntityBase {
    * @param {number} options.theta - Centreline angle from horizontal. [rad]
    * @param {number} options.centrelineHeight - The height of the centreline of the cloud, measured from ground level. [m]
    * @param {number} options.liquidFraction - The liquid fraction in the cloud. If there is liquid in the cloud at the start of the release, the fraction will usually drop gradually during the dispersion as the liquid droplets evaporate, and then drop to zero at the end of the segment when the droplets reach the ground and rain out of the cloud to form a pool. [fraction]
-   * @param {number} options.vapourTemperature - The temperature of the vapour portion of the cloud, including entrained air and any entrained water vapour. [K]
+   * @param {number} options.vapourTemperature - The temperature of the vapour portion of the cloud, including entrained air and any entrained water vapour. . [K]
    * @param {number} options.massConc - The mass concentration of release material, given as the mass in a given volume of cloud. The concentration is calculated using the Averaging Time set in the Dispersion Parameters. At the beginning of the release, this will be the same as the Cloud density, and it then drops below the density as air is entrained into the cloud. [kg/m3]
-   * @param {number} options.velocity - The velocity of the cloud at the centroid. [m/s]
+   * @param {number} options.velocity - The velocity of the cloud at the centroid. . [m/s]
    * @param {number} options.massFlow - Mass flow rate of material in the cloud (non-instantaneous releases) . The value will be constant for a given segment, but can be useful when you are investigating the effects of rainout and evaporation, and the segments that model these phenomena. [kg/s]
+   * @param {Enums.DynamicType} options.instCon - Instantanous or continuous (time-varying not permitted). (default value is Enums.DynamicType.UNSET)
    * @param {number} options.profileFlag - This shows the type of dispersion modelling being used for the current step.
    * @param {number} options.elevFlag - A flag to indicate whether the release is elevated, touching down, grounded or capped (by the mixing layer height).
    * @param {number} options.rhoCloud - The density of the cloud at the centreline. [kg/m3]
@@ -1242,7 +1394,6 @@ export class DispersionRecord extends EntityBase {
    * @param {number} options.dropletHeight - The representative height for liquid droplets in the cloud, measured above ground level. [m]
    * @param {number} options.dropletDistance - The downwind distance of droplets in the cloud. [m]
    * @param {number} options.mass - The mass of released material in the cloud (instantaneous releases). [kg]
-   * @param {Enums.DynamicType} options.instCon - Instantanous or continuous (time-varying not permitted). (default value is Enums.DynamicType.UNSET)
    */
   constructor(options?: {
     id?: string;
@@ -1264,6 +1415,7 @@ export class DispersionRecord extends EntityBase {
     massConc?: number;
     velocity?: number;
     massFlow?: number;
+    instCon?: Enums.DynamicType;
     profileFlag?: number;
     elevFlag?: number;
     rhoCloud?: number;
@@ -1276,7 +1428,6 @@ export class DispersionRecord extends EntityBase {
     dropletHeight?: number;
     dropletDistance?: number;
     mass?: number;
-    instCon?: Enums.DynamicType;
   }) {
     super(options?.id, options?.typeId, options?.displayName);
     this.observerIndex = options?.observerIndex;
@@ -1295,6 +1446,7 @@ export class DispersionRecord extends EntityBase {
     this.massConc = options?.massConc;
     this.velocity = options?.velocity;
     this.massFlow = options?.massFlow;
+    this.instCon = options?.instCon ?? Enums.DynamicType.UNSET;
     this.profileFlag = options?.profileFlag;
     this.elevFlag = options?.elevFlag;
     this.rhoCloud = options?.rhoCloud;
@@ -1307,7 +1459,6 @@ export class DispersionRecord extends EntityBase {
     this.dropletHeight = options?.dropletHeight;
     this.dropletDistance = options?.dropletDistance;
     this.mass = options?.mass;
-    this.instCon = options?.instCon ?? Enums.DynamicType.UNSET;
   }
 
   /** Initialise the entity with data from a dictionary. */
@@ -1361,6 +1512,9 @@ export class DispersionRecord extends EntityBase {
     if (data.massFlow !== undefined && typeof data.massFlow === 'number') {
       this.massFlow = data.massFlow as number;
     }
+    if (data.instCon !== undefined && (typeof data.instCon === 'string' || typeof data.instCon === 'number')) {
+      this.instCon = this.parseEnumValue(data.instCon, Enums.DynamicType);
+    }
     if (data.profileFlag !== undefined && typeof data.profileFlag === 'number') {
       this.profileFlag = data.profileFlag as number;
     }
@@ -1397,12 +1551,9 @@ export class DispersionRecord extends EntityBase {
     if (data.mass !== undefined && typeof data.mass === 'number') {
       this.mass = data.mass as number;
     }
-    if (data.instCon !== undefined && (typeof data.instCon === 'string' || typeof data.instCon === 'number')) {
-      this.instCon = this.parseEnumValue(data.instCon, Enums.DynamicType);
-    }
   }
 
-  private parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
+  protected parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
     if (typeof value === 'string' && value in enumType) {
       return enumType[value as keyof T];
     } else if (typeof value === 'number' && Object.values(enumType).includes(value)) {
@@ -1431,6 +1582,7 @@ export class DispersionRecord extends EntityBase {
       `massConc:    ${this.massConc}`,
       `velocity:    ${this.velocity}`,
       `massFlow:    ${this.massFlow}`,
+      `instCon:    ${this.instCon}`,
       `profileFlag:    ${this.profileFlag}`,
       `elevFlag:    ${this.elevFlag}`,
       `rhoCloud:    ${this.rhoCloud}`,
@@ -1443,7 +1595,6 @@ export class DispersionRecord extends EntityBase {
       `dropletHeight:    ${this.dropletHeight}`,
       `dropletDistance:    ${this.dropletDistance}`,
       `mass:    ${this.mass}`,
-      `instCon:    ${this.instCon}`,
     ];
     return parts.join('\n');
   }
@@ -1452,12 +1603,11 @@ export class DispersionRecord extends EntityBase {
 export class ExplosionConfinedVolume extends EntityBase {
   confinedStrength: number;
   confinedVolume: number;
-
   /**
    * Confined explosion volume data.
    *
    * @param {Object} options - Initialisation options
-   * @param {number} options.confinedStrength - The degree of confinement in the area or source, described by an integer between 3 (lowest) and 10 (highest). (default value is 7)
+   * @param {number} options.confinedStrength - The degree of confinement in the area or source, described by an integer between 3 (lowest) and 10 (highest). . (default value is 7)
    * @param {number} options.confinedVolume - The volume of the cloud that is contained in the area of confinement. [m3] (default value is 1)
    */
   constructor(options?: { id?: string; typeId?: string; displayName?: string; confinedStrength?: number; confinedVolume?: number }) {
@@ -1485,19 +1635,18 @@ export class ExplosionConfinedVolume extends EntityBase {
 
 export class ExplosionOutputConfig extends EntityBase {
   overpressureLevel: number;
-  meConfinedMethod?: Enums.MEConfinedMethod;
-
+  MEConfinedMethod?: Enums.MEConfinedMethod;
   /**
    * Explosion plotting and reporting parameters.
    *
    * @param {Object} options - Initialisation options
    * @param {number} options.overpressureLevel - Overpressure of interest for explosions. [N/m2] (default value is 2068)
-   * @param {Enums.MEConfinedMethod} options.meConfinedMethod - The multi energy confined method for modelling the effects of explosions. (default value is Enums.MEConfinedMethod.UNIFORM_CONFINED)
+   * @param {Enums.MEConfinedMethod} options.MEConfinedMethod - The multi energy confined method for modelling the effects of explosions. (default value is Enums.MEConfinedMethod.UNIFORM_CONFINED)
    */
-  constructor(options?: { id?: string; typeId?: string; displayName?: string; overpressureLevel?: number; meConfinedMethod?: Enums.MEConfinedMethod }) {
+  constructor(options?: { id?: string; typeId?: string; displayName?: string; overpressureLevel?: number; MEConfinedMethod?: Enums.MEConfinedMethod }) {
     super(options?.id, options?.typeId, options?.displayName);
     this.overpressureLevel = options?.overpressureLevel ?? 2068;
-    this.meConfinedMethod = options?.meConfinedMethod ?? Enums.MEConfinedMethod.UNIFORM_CONFINED;
+    this.MEConfinedMethod = options?.MEConfinedMethod ?? Enums.MEConfinedMethod.UNIFORM_CONFINED;
   }
 
   /** Initialise the entity with data from a dictionary. */
@@ -1506,12 +1655,12 @@ export class ExplosionOutputConfig extends EntityBase {
     if (data.overpressureLevel !== undefined && typeof data.overpressureLevel === 'number') {
       this.overpressureLevel = data.overpressureLevel as number;
     }
-    if (data.meConfinedMethod !== undefined && (typeof data.meConfinedMethod === 'string' || typeof data.meConfinedMethod === 'number')) {
-      this.meConfinedMethod = this.parseEnumValue(data.meConfinedMethod, Enums.MEConfinedMethod);
+    if (data.MEConfinedMethod !== undefined && (typeof data.MEConfinedMethod === 'string' || typeof data.MEConfinedMethod === 'number')) {
+      this.MEConfinedMethod = this.parseEnumValue(data.MEConfinedMethod, Enums.MEConfinedMethod);
     }
   }
 
-  private parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
+  protected parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
     if (typeof value === 'string' && value in enumType) {
       return enumType[value as keyof T];
     } else if (typeof value === 'number' && Object.values(enumType).includes(value)) {
@@ -1521,7 +1670,7 @@ export class ExplosionOutputConfig extends EntityBase {
   }
 
   toString() {
-    const parts = [super.toString(), '* ExplosionOutputConfig', `overpressureLevel:    ${this.overpressureLevel}`, `meConfinedMethod:    ${this.meConfinedMethod}`];
+    const parts = [super.toString(), '* ExplosionOutputConfig', `overpressureLevel:    ${this.overpressureLevel}`, `MEConfinedMethod:    ${this.MEConfinedMethod}`];
     return parts.join('\n');
   }
 }
@@ -1533,7 +1682,6 @@ export class ExplosionOverpressureResult extends EntityBase {
   explodedMass?: number;
   ignitionTime?: number;
   radius?: number;
-
   /**
    * Worst case explosion summary results for a given overpressure.
    *
@@ -1605,7 +1753,6 @@ export class ExplosionOverpressureResult extends EntityBase {
 
 export class ExplosionParameters extends EntityBase {
   explosionUniformStrength: number;
-
   /**
    * A set of parameters used in explosion calculations.
    *
@@ -1636,7 +1783,6 @@ export class FlameRecord extends EntityBase {
   zCoordinate?: number;
   rCoordinate?: number;
   phiCoordinate?: number;
-
   /**
    * A record containing flame geometry data.
    *
@@ -1687,21 +1833,20 @@ export class FlameRecord extends EntityBase {
 export class FlameResult extends EntityBase {
   time?: number;
   surfaceEmissivePower?: number;
+  fireType?: Enums.FireType;
   flameLength?: number;
   flameDiameter?: number;
-  fireType?: Enums.FireType;
   liftOffHeight?: number;
   liftOffTime?: number;
-
   /**
    * A set of flame results.
    *
    * @param {Object} options - Initialisation options
    * @param {number} options.time - Time of interest for time varying releases, or duration for initial rate releases. [s]
    * @param {number} options.surfaceEmissivePower - The rate at which thermal radiation is emitted from the surface of a flame per unit area. [W/m2]
+   * @param {Enums.FireType} options.fireType - Type of fire. (default value is Enums.FireType.NO_FIRE)
    * @param {number} options.flameLength - Length of the flame. [m]
    * @param {number} options.flameDiameter - Diameter of the flame. [m]
-   * @param {Enums.FireType} options.fireType - Type of fire. (default value is Enums.FireType.NO_FIRE)
    * @param {number} options.liftOffHeight - Fireball centre height. [m]
    * @param {number} options.liftOffTime - Time to lift off. [s]
    */
@@ -1711,18 +1856,18 @@ export class FlameResult extends EntityBase {
     displayName?: string;
     time?: number;
     surfaceEmissivePower?: number;
+    fireType?: Enums.FireType;
     flameLength?: number;
     flameDiameter?: number;
-    fireType?: Enums.FireType;
     liftOffHeight?: number;
     liftOffTime?: number;
   }) {
     super(options?.id, options?.typeId, options?.displayName);
     this.time = options?.time;
     this.surfaceEmissivePower = options?.surfaceEmissivePower;
+    this.fireType = options?.fireType ?? Enums.FireType.NO_FIRE;
     this.flameLength = options?.flameLength;
     this.flameDiameter = options?.flameDiameter;
-    this.fireType = options?.fireType ?? Enums.FireType.NO_FIRE;
     this.liftOffHeight = options?.liftOffHeight;
     this.liftOffTime = options?.liftOffTime;
   }
@@ -1736,15 +1881,15 @@ export class FlameResult extends EntityBase {
     if (data.surfaceEmissivePower !== undefined && typeof data.surfaceEmissivePower === 'number') {
       this.surfaceEmissivePower = data.surfaceEmissivePower as number;
     }
+    if (data.fireType !== undefined && (typeof data.fireType === 'string' || typeof data.fireType === 'number')) {
+      this.fireType = this.parseEnumValue(data.fireType, Enums.FireType);
+    }
     if (data.flameLength !== undefined && typeof data.flameLength === 'number') {
       this.flameLength = data.flameLength as number;
     }
     if (data.flameDiameter !== undefined && typeof data.flameDiameter === 'number') {
       this.flameDiameter = data.flameDiameter as number;
     }
-    if (data.fireType !== undefined && (typeof data.fireType === 'string' || typeof data.fireType === 'number')) {
-      this.fireType = this.parseEnumValue(data.fireType, Enums.FireType);
-    }
     if (data.liftOffHeight !== undefined && typeof data.liftOffHeight === 'number') {
       this.liftOffHeight = data.liftOffHeight as number;
     }
@@ -1753,7 +1898,7 @@ export class FlameResult extends EntityBase {
     }
   }
 
-  private parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
+  protected parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
     if (typeof value === 'string' && value in enumType) {
       return enumType[value as keyof T];
     } else if (typeof value === 'number' && Object.values(enumType).includes(value)) {
@@ -1768,9 +1913,9 @@ export class FlameResult extends EntityBase {
       '* FlameResult',
       `time:    ${this.time}`,
       `surfaceEmissivePower:    ${this.surfaceEmissivePower}`,
+      `fireType:    ${this.fireType}`,
       `flameLength:    ${this.flameLength}`,
       `flameDiameter:    ${this.flameDiameter}`,
-      `fireType:    ${this.fireType}`,
       `liftOffHeight:    ${this.liftOffHeight}`,
       `liftOffTime:    ${this.liftOffTime}`,
     ];
@@ -1781,7 +1926,6 @@ export class FlameResult extends EntityBase {
 export class Transect extends EntityBase {
   transectStartPoint: LocalPosition;
   transectEndPoint: LocalPosition;
-
   /**
    * A line segment, along which results are provided.
    *
@@ -1816,26 +1960,25 @@ export class Transect extends EntityBase {
 
 export class FlammableOutputConfig extends EntityBase {
   position: LocalPosition;
-  transect: Transect;
   radiationType?: Enums.RadiationType;
   contourType?: Enums.ContourType;
   radiationLevel: number;
   radiationResolution?: Enums.Resolution;
+  transect: Transect;
   fixedOrientation: number;
   orientation: number;
   fixedInclination: number;
   inclination: number;
-
   /**
    * Fire and radiation plotting and reporting parameters.
    *
    * @param {Object} options - Initialisation options
    * @param {LocalPosition} options.position - Position used for radiation calculations (except Transect).
-   * @param {Transect} options.transect - A line segment, along which results are provided.
    * @param {Enums.RadiationType} options.radiationType - The type of radiation result of interest. (default value is Enums.RadiationType.INTENSITY)
    * @param {Enums.ContourType} options.contourType - The type of contour plot. (default value is Enums.ContourType.FOOTPRINT_ELLIPSE)
    * @param {number} options.radiationLevel - The radiation level of interest for the RadiationType. (default value is 4000)
    * @param {Enums.Resolution} options.radiationResolution - Spatial resolution for radiation calculations. (default value is Enums.Resolution.MEDIUM)
+   * @param {Transect} options.transect - A line segment, along which results are provided.
    * @param {number} options.fixedOrientation - Whether to specify the orientation of a flat surface on which an observer lies with respect to the flame. (default value is 0)
    * @param {number} options.orientation - Angle between the projection of the observer normal onto the horizontal plane and the y axis. [rad] (default value is 0)
    * @param {number} options.fixedInclination - Whether to specify the inclination of a flat surface on which an observer lies with respect to the flame. (default value is 0)
@@ -1846,11 +1989,11 @@ export class FlammableOutputConfig extends EntityBase {
     typeId?: string;
     displayName?: string;
     position?: LocalPosition;
-    transect?: Transect;
     radiationType?: Enums.RadiationType;
     contourType?: Enums.ContourType;
     radiationLevel?: number;
     radiationResolution?: Enums.Resolution;
+    transect?: Transect;
     fixedOrientation?: number;
     orientation?: number;
     fixedInclination?: number;
@@ -1858,11 +2001,11 @@ export class FlammableOutputConfig extends EntityBase {
   }) {
     super(options?.id, options?.typeId, options?.displayName);
     this.position = options?.position ?? new LocalPosition();
-    this.transect = options?.transect ?? new Transect();
     this.radiationType = options?.radiationType ?? Enums.RadiationType.INTENSITY;
     this.contourType = options?.contourType ?? Enums.ContourType.FOOTPRINT_ELLIPSE;
     this.radiationLevel = options?.radiationLevel ?? 4000;
     this.radiationResolution = options?.radiationResolution ?? Enums.Resolution.MEDIUM;
+    this.transect = options?.transect ?? new Transect();
     this.fixedOrientation = options?.fixedOrientation ?? 0;
     this.orientation = options?.orientation ?? 0;
     this.fixedInclination = options?.fixedInclination ?? 0;
@@ -1876,10 +2019,6 @@ export class FlammableOutputConfig extends EntityBase {
       this.position = new LocalPosition();
       this.position.initialiseFromDictionary(data.position as { [key: string]: unknown });
     }
-    if (data.transect) {
-      this.transect = new Transect();
-      this.transect.initialiseFromDictionary(data.transect as { [key: string]: unknown });
-    }
     if (data.radiationType !== undefined && (typeof data.radiationType === 'string' || typeof data.radiationType === 'number')) {
       this.radiationType = this.parseEnumValue(data.radiationType, Enums.RadiationType);
     }
@@ -1892,6 +2031,10 @@ export class FlammableOutputConfig extends EntityBase {
     if (data.radiationResolution !== undefined && (typeof data.radiationResolution === 'string' || typeof data.radiationResolution === 'number')) {
       this.radiationResolution = this.parseEnumValue(data.radiationResolution, Enums.Resolution);
     }
+    if (data.transect) {
+      this.transect = new Transect();
+      this.transect.initialiseFromDictionary(data.transect as { [key: string]: unknown });
+    }
     if (data.fixedOrientation !== undefined && typeof data.fixedOrientation === 'number') {
       this.fixedOrientation = data.fixedOrientation as number;
     }
@@ -1906,7 +2049,7 @@ export class FlammableOutputConfig extends EntityBase {
     }
   }
 
-  private parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
+  protected parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
     if (typeof value === 'string' && value in enumType) {
       return enumType[value as keyof T];
     } else if (typeof value === 'number' && Object.values(enumType).includes(value)) {
@@ -1920,11 +2063,11 @@ export class FlammableOutputConfig extends EntityBase {
       super.toString(),
       '* FlammableOutputConfig',
       `position:    ${this.position?.toString()}`,
-      `transect:    ${this.transect?.toString()}`,
       `radiationType:    ${this.radiationType}`,
       `contourType:    ${this.contourType}`,
       `radiationLevel:    ${this.radiationLevel}`,
       `radiationResolution:    ${this.radiationResolution}`,
+      `transect:    ${this.transect?.toString()}`,
       `fixedOrientation:    ${this.fixedOrientation}`,
       `orientation:    ${this.orientation}`,
       `fixedInclination:    ${this.fixedInclination}`,
@@ -1941,7 +2084,6 @@ export class FlammableParameters extends EntityBase {
   jetFireAutoSelect: boolean;
   timeAveraging: boolean;
   timeOfInterest: number;
-
   /**
    * A set of parameters used in fire and radiation calculations.
    *
@@ -1949,8 +2091,8 @@ export class FlammableParameters extends EntityBase {
    * @param {number} options.maxExposureDuration - The time that someone will remain in range of the radiation before attempting to escape. It is used in the calculations of dose and lethality. [s] (default value is 20)
    * @param {number} options.radiationRelativeTolerance - Controls the precision of the numerical integration over the visible surface of the flame when calculating the view factor of the flame as seen by an observer at a specific position. [fraction] (default value is 0.01)
    * @param {Enums.PoolFireType} options.poolFireType - Type of pool fire modelling. (default value is Enums.PoolFireType.LATE)
-   * @param {boolean} options.jetFireAutoSelect - Whether to have the calculations automatically select the type of jet fire modelling. (default value is false)
-   * @param {boolean} options.timeAveraging - Whether to base the jet fire calculations on a discharge rate averaged between 0 seconds and a TimeOfInterest. (default value is true)
+   * @param {boolean} options.jetFireAutoSelect - Whether to have the calculations automatically select the type of jet fire modelling. (default value is False)
+   * @param {boolean} options.timeAveraging - Whether to base the jet fire calculations on a discharge rate averaged between 0 seconds and a TimeOfInterest. (default value is True)
    * @param {number} options.timeOfInterest - The time of interest in the jet fire calculations. The jet fire will be based on the discharge results either at the TimeOfInterest or averaged between 0 seconds and the TimeOfInterest, depending on the TimeAveraging option. (default value is 20)
    */
   constructor(options?: {
@@ -1996,7 +2138,7 @@ export class FlammableParameters extends EntityBase {
     }
   }
 
-  private parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
+  protected parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
     if (typeof value === 'string' && value in enumType) {
       return enumType[value as keyof T];
     } else if (typeof value === 'number' && Object.values(enumType).includes(value)) {
@@ -2030,14 +2172,13 @@ export class FlashResult extends EntityBase {
   vapourEntropy?: number;
   liquidEnthalpy?: number;
   vapourEnthalpy?: number;
+  fluidPhase?: Enums.Phase;
   bubblePointPressure?: number;
   bubblePointTemperature?: number;
   dewPointPressure?: number;
   dewPointTemperature?: number;
   totalFluidDensity?: number;
   liquidMassFraction?: number;
-  fluidPhase?: Enums.Phase;
-
   /**
    * Physical properties for a material generated at a particular pressure and temperature.
    *
@@ -2051,13 +2192,13 @@ export class FlashResult extends EntityBase {
    * @param {number} options.vapourEntropy - Entropy of vapour phase. [J/kg.K]
    * @param {number} options.liquidEnthalpy - Enthalpy of liquid phase.
    * @param {number} options.vapourEnthalpy - Enthalpy of vapour phase.
+   * @param {Enums.Phase} options.fluidPhase - Vapour, liquid or two-phase. (default value is Enums.Phase.UNSET)
    * @param {number} options.bubblePointPressure - Mixture bubble point pressure at given temperature. [N/m2]
    * @param {number} options.bubblePointTemperature - Mixture bubble point temperature at given pressure. [K]
    * @param {number} options.dewPointPressure - Mixture dew point pressure at given temperature. [N/m2]
    * @param {number} options.dewPointTemperature - Mixture dew point temperature at given pressure. [K]
    * @param {number} options.totalFluidDensity - Total fluid density (mass-based). [kg/m3]
    * @param {number} options.liquidMassFraction - Liquid mass fraction. [fraction]
-   * @param {Enums.Phase} options.fluidPhase - Vapour, liquid or two-phase. (default value is Enums.Phase.UNSET)
    */
   constructor(options?: {
     id?: string;
@@ -2072,13 +2213,13 @@ export class FlashResult extends EntityBase {
     vapourEntropy?: number;
     liquidEnthalpy?: number;
     vapourEnthalpy?: number;
+    fluidPhase?: Enums.Phase;
     bubblePointPressure?: number;
     bubblePointTemperature?: number;
     dewPointPressure?: number;
     dewPointTemperature?: number;
     totalFluidDensity?: number;
     liquidMassFraction?: number;
-    fluidPhase?: Enums.Phase;
   }) {
     super(options?.id, options?.typeId, options?.displayName);
     this.pressure = options?.pressure;
@@ -2090,13 +2231,13 @@ export class FlashResult extends EntityBase {
     this.vapourEntropy = options?.vapourEntropy;
     this.liquidEnthalpy = options?.liquidEnthalpy;
     this.vapourEnthalpy = options?.vapourEnthalpy;
+    this.fluidPhase = options?.fluidPhase ?? Enums.Phase.UNSET;
     this.bubblePointPressure = options?.bubblePointPressure;
     this.bubblePointTemperature = options?.bubblePointTemperature;
     this.dewPointPressure = options?.dewPointPressure;
     this.dewPointTemperature = options?.dewPointTemperature;
     this.totalFluidDensity = options?.totalFluidDensity;
     this.liquidMassFraction = options?.liquidMassFraction;
-    this.fluidPhase = options?.fluidPhase ?? Enums.Phase.UNSET;
   }
 
   /** Initialise the entity with data from a dictionary. */
@@ -2129,6 +2270,9 @@ export class FlashResult extends EntityBase {
     if (data.vapourEnthalpy !== undefined && typeof data.vapourEnthalpy === 'number') {
       this.vapourEnthalpy = data.vapourEnthalpy as number;
     }
+    if (data.fluidPhase !== undefined && (typeof data.fluidPhase === 'string' || typeof data.fluidPhase === 'number')) {
+      this.fluidPhase = this.parseEnumValue(data.fluidPhase, Enums.Phase);
+    }
     if (data.bubblePointPressure !== undefined && typeof data.bubblePointPressure === 'number') {
       this.bubblePointPressure = data.bubblePointPressure as number;
     }
@@ -2147,12 +2291,9 @@ export class FlashResult extends EntityBase {
     if (data.liquidMassFraction !== undefined && typeof data.liquidMassFraction === 'number') {
       this.liquidMassFraction = data.liquidMassFraction as number;
     }
-    if (data.fluidPhase !== undefined && (typeof data.fluidPhase === 'string' || typeof data.fluidPhase === 'number')) {
-      this.fluidPhase = this.parseEnumValue(data.fluidPhase, Enums.Phase);
-    }
   }
 
-  private parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
+  protected parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
     if (typeof value === 'string' && value in enumType) {
       return enumType[value as keyof T];
     } else if (typeof value === 'number' && Object.values(enumType).includes(value)) {
@@ -2174,13 +2315,13 @@ export class FlashResult extends EntityBase {
       `vapourEntropy:    ${this.vapourEntropy}`,
       `liquidEnthalpy:    ${this.liquidEnthalpy}`,
       `vapourEnthalpy:    ${this.vapourEnthalpy}`,
+      `fluidPhase:    ${this.fluidPhase}`,
       `bubblePointPressure:    ${this.bubblePointPressure}`,
       `bubblePointTemperature:    ${this.bubblePointTemperature}`,
       `dewPointPressure:    ${this.dewPointPressure}`,
       `dewPointTemperature:    ${this.dewPointTemperature}`,
       `totalFluidDensity:    ${this.totalFluidDensity}`,
       `liquidMassFraction:    ${this.liquidMassFraction}`,
-      `fluidPhase:    ${this.fluidPhase}`,
     ];
     return parts.join('\n');
   }
@@ -2190,14 +2331,13 @@ export class Leak extends ReleaseOverTime {
   holeDiameter?: number;
   holeHeightFraction: number;
   releaseElevation: number;
-
   /**
    * A storage scenario which models a release of material through a hole in a vessel or pipe.
    *
    * @param {Object} options - Initialisation options
-   * @param {number} options.holeDiameter - The diameter of the equivalent circular orifice with the same area as the area of the leak. [m]
    * @param {number} options.releaseAngle - Angle of release above a horizontal plane. [rad] (default value is 0.0)
    * @param {Enums.TimeVaryingOption} options.timeVaryingOption - Whether the release is a time-varying release or a steady state release using the initial rate. (default value is Enums.TimeVaryingOption.INITIAL_RATE)
+   * @param {number} options.holeDiameter - The diameter of the equivalent circular orifice with the same area as the area of the leak. [m]
    * @param {number} options.holeHeightFraction - Location of the hole above the base of a vessel as a fraction of the vessel's vertical dimension. [fraction] (default value is 0.5)
    * @param {number} options.releaseElevation - The elevation of the release. [m] (default value is 1)
    */
@@ -2205,9 +2345,9 @@ export class Leak extends ReleaseOverTime {
     id?: string;
     typeId?: string;
     displayName?: string;
-    holeDiameter?: number;
     releaseAngle?: number;
     timeVaryingOption?: Enums.TimeVaryingOption;
+    holeDiameter?: number;
     holeHeightFraction?: number;
     releaseElevation?: number;
   }) {
@@ -2235,9 +2375,9 @@ export class Leak extends ReleaseOverTime {
     const parts = [
       super.toString(),
       '* Leak',
-      `holeDiameter:    ${this.holeDiameter}`,
       `releaseAngle:    ${this.releaseAngle}`,
       `timeVaryingOption:    ${this.timeVaryingOption}`,
+      `holeDiameter:    ${this.holeDiameter}`,
       `holeHeightFraction:    ${this.holeHeightFraction}`,
       `releaseElevation:    ${this.releaseElevation}`,
     ];
@@ -2250,15 +2390,14 @@ export class LineRupture extends ReleaseOverTime {
   pipeLength?: number;
   pipeRoughness: number;
   pipeHeightFraction: number;
-
   /**
    * A storage scenario which models a release of material due to rupture of a short length of pipework attached to a vessel or any kind of pressure reservoir.
    *
    * @param {Object} options - Initialisation options
-   * @param {number} options.pipeDiameter - Internal diameter of the short pipe. [m]
-   * @param {number} options.pipeLength - Length of the short pipe. [m]
    * @param {number} options.releaseAngle - Angle of release above a horizontal plane. [rad] (default value is 0.0)
    * @param {Enums.TimeVaryingOption} options.timeVaryingOption - Whether the release is a time-varying release or a steady state release using the initial rate. (default value is Enums.TimeVaryingOption.INITIAL_RATE)
+   * @param {number} options.pipeDiameter - Internal diameter of the short pipe. [m]
+   * @param {number} options.pipeLength - Length of the short pipe. [m]
    * @param {number} options.pipeRoughness - Roughness of the short pipe. [m] (default value is 0.000045)
    * @param {number} options.pipeHeightFraction - Height of the pipe connection measured from the base of the vessel. [fraction] (default value is 0.5)
    */
@@ -2266,10 +2405,10 @@ export class LineRupture extends ReleaseOverTime {
     id?: string;
     typeId?: string;
     displayName?: string;
-    pipeDiameter?: number;
-    pipeLength?: number;
     releaseAngle?: number;
     timeVaryingOption?: Enums.TimeVaryingOption;
+    pipeDiameter?: number;
+    pipeLength?: number;
     pipeRoughness?: number;
     pipeHeightFraction?: number;
   }) {
@@ -2301,10 +2440,10 @@ export class LineRupture extends ReleaseOverTime {
     const parts = [
       super.toString(),
       '* LineRupture',
-      `pipeDiameter:    ${this.pipeDiameter}`,
-      `pipeLength:    ${this.pipeLength}`,
       `releaseAngle:    ${this.releaseAngle}`,
       `timeVaryingOption:    ${this.timeVaryingOption}`,
+      `pipeDiameter:    ${this.pipeDiameter}`,
+      `pipeLength:    ${this.pipeLength}`,
       `pipeRoughness:    ${this.pipeRoughness}`,
       `pipeHeightFraction:    ${this.pipeHeightFraction}`,
     ];
@@ -2320,7 +2459,6 @@ export class MaterialComponentDataItem extends EntityBase {
   calculationLimits?: number[];
   supercriticalExtrapolation: number;
   fractionTc: number;
-
   /**
    * Material component data item.
    *
@@ -2346,11 +2484,11 @@ export class MaterialComponentDataItem extends EntityBase {
     fractionTc?: number;
   }) {
     super(options?.id, options?.typeId, options?.displayName);
-    this.equationNumber = options?.equationNumber;
-    this.equationCoefficients = options?.equationCoefficients;
-    this.calculationLimits = options?.calculationLimits;
     this.description = options?.description ?? '';
+    this.equationNumber = options?.equationNumber;
     this.equationString = options?.equationString ?? '';
+    this.equationCoefficients = options?.equationCoefficients ?? [];
+    this.calculationLimits = options?.calculationLimits ?? [];
     this.supercriticalExtrapolation = options?.supercriticalExtrapolation ?? 0;
     this.fractionTc = options?.fractionTc ?? 1;
   }
@@ -2358,21 +2496,21 @@ export class MaterialComponentDataItem extends EntityBase {
   /** Initialise the entity with data from a dictionary. */
   initialiseFromDictionary(data: { [key: string]: unknown }) {
     super.initialiseFromDictionary(data);
-    if (data.equationNumber !== undefined && typeof data.equationNumber === 'number') {
-      this.equationNumber = data.equationNumber as number;
-    }
-    if (data.equationCoefficients && Array.isArray(data.equationCoefficients)) {
-      this.equationCoefficients = (data.equationCoefficients ?? []).map((item) => parseFloat(item));
-    }
-    if (data.calculationLimits && Array.isArray(data.calculationLimits)) {
-      this.calculationLimits = (data.calculationLimits ?? []).map((item) => parseFloat(item));
-    }
     if (data.description !== undefined && typeof data.description === 'string') {
       this.description = data.description as string;
     }
+    if (data.equationNumber !== undefined && typeof data.equationNumber === 'number') {
+      this.equationNumber = data.equationNumber as number;
+    }
     if (data.equationString !== undefined && typeof data.equationString === 'string') {
       this.equationString = data.equationString as string;
     }
+    if (data.equationCoefficients !== undefined && Array.isArray(data.equationCoefficients)) {
+      this.equationCoefficients = data.equationCoefficients as number[];
+    }
+    if (data.calculationLimits !== undefined && Array.isArray(data.calculationLimits)) {
+      this.calculationLimits = data.calculationLimits as number[];
+    }
     if (data.supercriticalExtrapolation !== undefined && typeof data.supercriticalExtrapolation === 'number') {
       this.supercriticalExtrapolation = data.supercriticalExtrapolation as number;
     }
@@ -2385,11 +2523,11 @@ export class MaterialComponentDataItem extends EntityBase {
     const parts = [
       super.toString(),
       '* MaterialComponentDataItem',
-      `equationNumber:    ${this.equationNumber}`,
-      this.equationCoefficients?.map((item) => item?.toString()).join('\n'),
-      this.calculationLimits?.map((item) => item?.toString()).join('\n'),
       `description:    ${this.description}`,
+      `equationNumber:    ${this.equationNumber}`,
       `equationString:    ${this.equationString}`,
+      `equationCoefficients:    ${this.equationCoefficients}`,
+      `calculationLimits:    ${this.calculationLimits}`,
       `supercriticalExtrapolation:    ${this.supercriticalExtrapolation}`,
       `fractionTc:    ${this.fractionTc}`,
     ];
@@ -2402,7 +2540,6 @@ export class MaterialComponentData extends EntityBase {
   dipprVersion?: number;
   casId?: number;
   dataItem: MaterialComponentDataItem[];
-
   /**
    * Data related to a MaterialComponent.
    *
@@ -2414,15 +2551,18 @@ export class MaterialComponentData extends EntityBase {
    */
   constructor(options?: { id?: string; typeId?: string; displayName?: string; name?: string; dipprVersion?: number; casId?: number; dataItem?: MaterialComponentDataItem[] }) {
     super(options?.id, options?.typeId, options?.displayName);
+    this.name = options?.name ?? '';
     this.dipprVersion = options?.dipprVersion;
     this.casId = options?.casId;
     this.dataItem = options?.dataItem ?? [new MaterialComponentDataItem()];
-    this.name = options?.name ?? '';
   }
 
   /** Initialise the entity with data from a dictionary. */
   initialiseFromDictionary(data: { [key: string]: unknown }) {
     super.initialiseFromDictionary(data);
+    if (data.name !== undefined && typeof data.name === 'string') {
+      this.name = data.name as string;
+    }
     if (data.dipprVersion !== undefined && typeof data.dipprVersion === 'number') {
       this.dipprVersion = data.dipprVersion as number;
     }
@@ -2436,19 +2576,16 @@ export class MaterialComponentData extends EntityBase {
         return record;
       });
     }
-    if (data.name !== undefined && typeof data.name === 'string') {
-      this.name = data.name as string;
-    }
   }
 
   toString() {
     const parts = [
       super.toString(),
       '* MaterialComponentData',
+      `name:    ${this.name}`,
       `dipprVersion:    ${this.dipprVersion}`,
       `casId:    ${this.casId}`,
       this.dataItem?.map((item) => item?.toString()).join('\n'),
-      `name:    ${this.name}`,
     ];
     return parts.join('\n');
   }
@@ -2459,6 +2596,7 @@ export class MixtureConstantPropertiesResult extends EntityBase {
   upperFlammabilityLimit?: number;
   criticalPressure?: number;
   criticalTemperature?: number;
+  flammableToxicFlag?: Enums.FlammableToxic;
   flashPoint?: number;
   heatCombustion?: number;
   maximumBurnRate?: number;
@@ -2466,12 +2604,10 @@ export class MixtureConstantPropertiesResult extends EntityBase {
   molecularWeight?: number;
   bubblePoint?: number;
   poolFireBurnRateLength?: number;
+  luminousSmokyFlame?: Enums.LuminousSmokyFlame;
   dewPoint?: number;
   emissivePowerLengthScale?: number;
   laminarBurningVelocity?: number;
-  flammableToxicFlag?: Enums.FlammableToxic;
-  luminousSmokyFlame?: Enums.LuminousSmokyFlame;
-
   /**
    * Constant properties of a mixture.
    *
@@ -2480,6 +2616,7 @@ export class MixtureConstantPropertiesResult extends EntityBase {
    * @param {number} options.upperFlammabilityLimit - The maximum concentration of vapour in air that is capable of propagating a flame through a homogeneous mixture of air and the vapour. [fraction]
    * @param {number} options.criticalPressure - The pressure above which liquid and gas cannot coexist at any temperature. [N/m2]
    * @param {number} options.criticalTemperature - The temperature above which the gas cannot become liquid, regardless of the applied pressure. [K]
+   * @param {Enums.FlammableToxic} options.flammableToxicFlag - Whether a material is flammable, toxic, both or inert. (default value is Enums.FlammableToxic.INERT)
    * @param {number} options.flashPoint - The lowest temperature at which a liquid can create enough vapour to ignite when exposed to an external heat source. [K]
    * @param {number} options.heatCombustion - The amount of energy released in the form of heat when one mole of a substance is burned.
    * @param {number} options.maximumBurnRate - The maximum mass rate at which a material burns per unit area, used in pool fire modelling.
@@ -2487,11 +2624,10 @@ export class MixtureConstantPropertiesResult extends EntityBase {
    * @param {number} options.molecularWeight - The sum of the atomic masses of all atoms in a molecule. [kg/kmol]
    * @param {number} options.bubblePoint - The temperature where the first bubble of vapor is formed when heating a liquid at atmospheric pressure. [K]
    * @param {number} options.poolFireBurnRateLength - A characteristic pool fire burn rate length. [m]
+   * @param {Enums.LuminousSmokyFlame} options.luminousSmokyFlame - A flag to indicate whether a flame is luminous or smoky. (default value is Enums.LuminousSmokyFlame.GENERAL)
    * @param {number} options.dewPoint - The temperature at which the first liquid drop will form when cooling a gas at atmospheric pressure. [K]
    * @param {number} options.emissivePowerLengthScale - Used in pool fire modelling for calculating the emissive power for a fire with a given diameter. [m]
    * @param {number} options.laminarBurningVelocity - The flame speed, used in the Multi-Energy explosion modelling to calculate the peak overpressure, and can also be used in the pool fire calculations to calculate the MaximumBurnRate. [m/s]
-   * @param {Enums.FlammableToxic} options.flammableToxicFlag - Whether a material is flammable, toxic, both or inert. (default value is Enums.FlammableToxic.INERT)
-   * @param {Enums.LuminousSmokyFlame} options.luminousSmokyFlame - A flag to indicate whether a flame is luminous or smoky. (default value is Enums.LuminousSmokyFlame.GENERAL)
    */
   constructor(options?: {
     id?: string;
@@ -2501,6 +2637,7 @@ export class MixtureConstantPropertiesResult extends EntityBase {
     upperFlammabilityLimit?: number;
     criticalPressure?: number;
     criticalTemperature?: number;
+    flammableToxicFlag?: Enums.FlammableToxic;
     flashPoint?: number;
     heatCombustion?: number;
     maximumBurnRate?: number;
@@ -2508,17 +2645,17 @@ export class MixtureConstantPropertiesResult extends EntityBase {
     molecularWeight?: number;
     bubblePoint?: number;
     poolFireBurnRateLength?: number;
+    luminousSmokyFlame?: Enums.LuminousSmokyFlame;
     dewPoint?: number;
     emissivePowerLengthScale?: number;
     laminarBurningVelocity?: number;
-    flammableToxicFlag?: Enums.FlammableToxic;
-    luminousSmokyFlame?: Enums.LuminousSmokyFlame;
   }) {
     super(options?.id, options?.typeId, options?.displayName);
     this.lowerFlammabilityLimit = options?.lowerFlammabilityLimit;
     this.upperFlammabilityLimit = options?.upperFlammabilityLimit;
     this.criticalPressure = options?.criticalPressure;
     this.criticalTemperature = options?.criticalTemperature;
+    this.flammableToxicFlag = options?.flammableToxicFlag ?? Enums.FlammableToxic.INERT;
     this.flashPoint = options?.flashPoint;
     this.heatCombustion = options?.heatCombustion;
     this.maximumBurnRate = options?.maximumBurnRate;
@@ -2526,11 +2663,10 @@ export class MixtureConstantPropertiesResult extends EntityBase {
     this.molecularWeight = options?.molecularWeight;
     this.bubblePoint = options?.bubblePoint;
     this.poolFireBurnRateLength = options?.poolFireBurnRateLength;
+    this.luminousSmokyFlame = options?.luminousSmokyFlame ?? Enums.LuminousSmokyFlame.GENERAL;
     this.dewPoint = options?.dewPoint;
     this.emissivePowerLengthScale = options?.emissivePowerLengthScale;
     this.laminarBurningVelocity = options?.laminarBurningVelocity;
-    this.flammableToxicFlag = options?.flammableToxicFlag ?? Enums.FlammableToxic.INERT;
-    this.luminousSmokyFlame = options?.luminousSmokyFlame ?? Enums.LuminousSmokyFlame.GENERAL;
   }
 
   /** Initialise the entity with data from a dictionary. */
@@ -2548,6 +2684,9 @@ export class MixtureConstantPropertiesResult extends EntityBase {
     if (data.criticalTemperature !== undefined && typeof data.criticalTemperature === 'number') {
       this.criticalTemperature = data.criticalTemperature as number;
     }
+    if (data.flammableToxicFlag !== undefined && (typeof data.flammableToxicFlag === 'string' || typeof data.flammableToxicFlag === 'number')) {
+      this.flammableToxicFlag = this.parseEnumValue(data.flammableToxicFlag, Enums.FlammableToxic);
+    }
     if (data.flashPoint !== undefined && typeof data.flashPoint === 'number') {
       this.flashPoint = data.flashPoint as number;
     }
@@ -2569,6 +2708,9 @@ export class MixtureConstantPropertiesResult extends EntityBase {
     if (data.poolFireBurnRateLength !== undefined && typeof data.poolFireBurnRateLength === 'number') {
       this.poolFireBurnRateLength = data.poolFireBurnRateLength as number;
     }
+    if (data.luminousSmokyFlame !== undefined && (typeof data.luminousSmokyFlame === 'string' || typeof data.luminousSmokyFlame === 'number')) {
+      this.luminousSmokyFlame = this.parseEnumValue(data.luminousSmokyFlame, Enums.LuminousSmokyFlame);
+    }
     if (data.dewPoint !== undefined && typeof data.dewPoint === 'number') {
       this.dewPoint = data.dewPoint as number;
     }
@@ -2578,15 +2720,9 @@ export class MixtureConstantPropertiesResult extends EntityBase {
     if (data.laminarBurningVelocity !== undefined && typeof data.laminarBurningVelocity === 'number') {
       this.laminarBurningVelocity = data.laminarBurningVelocity as number;
     }
-    if (data.flammableToxicFlag !== undefined && (typeof data.flammableToxicFlag === 'string' || typeof data.flammableToxicFlag === 'number')) {
-      this.flammableToxicFlag = this.parseEnumValue(data.flammableToxicFlag, Enums.FlammableToxic);
-    }
-    if (data.luminousSmokyFlame !== undefined && (typeof data.luminousSmokyFlame === 'string' || typeof data.luminousSmokyFlame === 'number')) {
-      this.luminousSmokyFlame = this.parseEnumValue(data.luminousSmokyFlame, Enums.LuminousSmokyFlame);
-    }
   }
 
-  private parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
+  protected parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
     if (typeof value === 'string' && value in enumType) {
       return enumType[value as keyof T];
     } else if (typeof value === 'number' && Object.values(enumType).includes(value)) {
@@ -2603,6 +2739,7 @@ export class MixtureConstantPropertiesResult extends EntityBase {
       `upperFlammabilityLimit:    ${this.upperFlammabilityLimit}`,
       `criticalPressure:    ${this.criticalPressure}`,
       `criticalTemperature:    ${this.criticalTemperature}`,
+      `flammableToxicFlag:    ${this.flammableToxicFlag}`,
       `flashPoint:    ${this.flashPoint}`,
       `heatCombustion:    ${this.heatCombustion}`,
       `maximumBurnRate:    ${this.maximumBurnRate}`,
@@ -2610,11 +2747,10 @@ export class MixtureConstantPropertiesResult extends EntityBase {
       `molecularWeight:    ${this.molecularWeight}`,
       `bubblePoint:    ${this.bubblePoint}`,
       `poolFireBurnRateLength:    ${this.poolFireBurnRateLength}`,
+      `luminousSmokyFlame:    ${this.luminousSmokyFlame}`,
       `dewPoint:    ${this.dewPoint}`,
       `emissivePowerLengthScale:    ${this.emissivePowerLengthScale}`,
       `laminarBurningVelocity:    ${this.laminarBurningVelocity}`,
-      `flammableToxicFlag:    ${this.flammableToxicFlag}`,
-      `luminousSmokyFlame:    ${this.luminousSmokyFlame}`,
     ];
     return parts.join('\n');
   }
@@ -2624,11 +2760,10 @@ export class Pipe extends Asset {
   nodes: LocalPosition[];
   nodeCount?: number;
   diameter?: number;
+  roughness: number;
   material: Material;
   state: State;
-  roughness: number;
   pumpedInflow: number;
-
   /**
    * An asset to model events that involve releases from pressurised pipelines.
    *
@@ -2637,9 +2772,9 @@ export class Pipe extends Asset {
    * @param {LocalPosition[]} options.nodes - A set of points along the pipe.
    * @param {number} options.nodeCount - The number of nodes along the pipe.
    * @param {number} options.diameter - Diameter of the pipe. [m]
+   * @param {number} options.roughness - A measure of the roughness of internal surfaces of the pipe. [m] (default value is 4.5e-5)
    * @param {Material} options.material - Material.
    * @param {State} options.state - Fluid state in the pipe.
-   * @param {number} options.roughness - A measure of the roughness of internal surfaces of the pipe. [m] (default value is 4.5e-5)
    * @param {number} options.pumpedInflow - Flowrate along the pipeline under normal operating conditions. [kg/s] (default value is 0)
    */
   constructor(options?: {
@@ -2650,18 +2785,18 @@ export class Pipe extends Asset {
     nodes?: LocalPosition[];
     nodeCount?: number;
     diameter?: number;
+    roughness?: number;
     material?: Material;
     state?: State;
-    roughness?: number;
     pumpedInflow?: number;
   }) {
     super(options);
     this.nodes = options?.nodes ?? [new LocalPosition()];
     this.nodeCount = options?.nodeCount;
     this.diameter = options?.diameter;
+    this.roughness = options?.roughness ?? 4.5e-5;
     this.material = options?.material ?? new Material();
     this.state = options?.state ?? new State();
-    this.roughness = options?.roughness ?? 4.5e-5;
     this.pumpedInflow = options?.pumpedInflow ?? 0;
   }
 
@@ -2681,6 +2816,9 @@ export class Pipe extends Asset {
     if (data.diameter !== undefined && typeof data.diameter === 'number') {
       this.diameter = data.diameter as number;
     }
+    if (data.roughness !== undefined && typeof data.roughness === 'number') {
+      this.roughness = data.roughness as number;
+    }
     if (data.material) {
       this.material = new Material();
       this.material.initialiseFromDictionary(data.material as { [key: string]: unknown });
@@ -2689,9 +2827,6 @@ export class Pipe extends Asset {
       this.state = new State();
       this.state.initialiseFromDictionary(data.state as { [key: string]: unknown });
     }
-    if (data.roughness !== undefined && typeof data.roughness === 'number') {
-      this.roughness = data.roughness as number;
-    }
     if (data.pumpedInflow !== undefined && typeof data.pumpedInflow === 'number') {
       this.pumpedInflow = data.pumpedInflow as number;
     }
@@ -2705,9 +2840,9 @@ export class Pipe extends Asset {
       this.nodes?.map((item) => item?.toString()).join('\n'),
       `nodeCount:    ${this.nodeCount}`,
       `diameter:    ${this.diameter}`,
+      `roughness:    ${this.roughness}`,
       `material:    ${this.material?.toString()}`,
       `state:    ${this.state?.toString()}`,
-      `roughness:    ${this.roughness}`,
       `pumpedInflow:    ${this.pumpedInflow}`,
     ];
     return parts.join('\n');
@@ -2717,28 +2852,35 @@ export class Pipe extends Asset {
 export class PipeBreach extends ReleaseOverTime {
   distanceDownstream?: number;
   relativeAperture: number;
-
+  holeDiameter: number;
+  breachSizingMethod?: Enums.BreachSizingMethod;
   /**
    * A storage scenario which models a time-dependent release of material from its process or transport conditions in a pipeline.
    *
    * @param {Object} options - Initialisation options
-   * @param {number} options.distanceDownstream - The distance of the pipe breach, measured along the pipeline from the upstream end. [m]
    * @param {number} options.releaseAngle - Angle of release above a horizontal plane. [rad] (default value is 0.0)
    * @param {Enums.TimeVaryingOption} options.timeVaryingOption - Whether the release is a time-varying release or a steady state release using the initial rate. (default value is Enums.TimeVaryingOption.INITIAL_RATE)
+   * @param {number} options.distanceDownstream - The distance of the pipe breach, measured along the pipeline from the upstream end. [m]
    * @param {number} options.relativeAperture - The size of the outflow area as a fraction of the total potential outflow area for the breach location. [fraction] (default value is 1)
+   * @param {number} options.holeDiameter - Diameter of the breach. [m] (default value is 0.05)
+   * @param {Enums.BreachSizingMethod} options.breachSizingMethod - Selection of the breach size method. (default value is Enums.BreachSizingMethod.RELATIVE_SIZE)
    */
   constructor(options?: {
     id?: string;
     typeId?: string;
     displayName?: string;
-    distanceDownstream?: number;
     releaseAngle?: number;
     timeVaryingOption?: Enums.TimeVaryingOption;
+    distanceDownstream?: number;
     relativeAperture?: number;
+    holeDiameter?: number;
+    breachSizingMethod?: Enums.BreachSizingMethod;
   }) {
     super(options);
     this.distanceDownstream = options?.distanceDownstream;
     this.relativeAperture = options?.relativeAperture ?? 1;
+    this.holeDiameter = options?.holeDiameter ?? 0.05;
+    this.breachSizingMethod = options?.breachSizingMethod ?? Enums.BreachSizingMethod.RELATIVE_SIZE;
   }
 
   /** Initialise the entity with data from a dictionary. */
@@ -2750,16 +2892,24 @@ export class PipeBreach extends ReleaseOverTime {
     if (data.relativeAperture !== undefined && typeof data.relativeAperture === 'number') {
       this.relativeAperture = data.relativeAperture as number;
     }
+    if (data.holeDiameter !== undefined && typeof data.holeDiameter === 'number') {
+      this.holeDiameter = data.holeDiameter as number;
+    }
+    if (data.breachSizingMethod !== undefined && (typeof data.breachSizingMethod === 'string' || typeof data.breachSizingMethod === 'number')) {
+      this.breachSizingMethod = this.parseEnumValue(data.breachSizingMethod, Enums.BreachSizingMethod);
+    }
   }
 
   toString() {
     const parts = [
       super.toString(),
       '* PipeBreach',
-      `distanceDownstream:    ${this.distanceDownstream}`,
       `releaseAngle:    ${this.releaseAngle}`,
       `timeVaryingOption:    ${this.timeVaryingOption}`,
+      `distanceDownstream:    ${this.distanceDownstream}`,
       `relativeAperture:    ${this.relativeAperture}`,
+      `holeDiameter:    ${this.holeDiameter}`,
+      `breachSizingMethod:    ${this.breachSizingMethod}`,
     ];
     return parts.join('\n');
   }
@@ -2768,20 +2918,19 @@ export class PipeBreach extends ReleaseOverTime {
 export class PoolFireFlameResult extends FlameResult {
   poolZoneSEP?: number[];
   poolCentre?: number;
-
   /**
    * Flame results for a pool fire.
    *
    * @param {Object} options - Initialisation options
    * @param {number} options.time - Time of interest for time varying releases, or duration for initial rate releases. [s]
    * @param {number} options.surfaceEmissivePower - The rate at which thermal radiation is emitted from the surface of a flame per unit area. [W/m2]
+   * @param {Enums.FireType} options.fireType - Type of fire. (default value is Enums.FireType.NO_FIRE)
    * @param {number} options.flameLength - Length of the flame. [m]
    * @param {number} options.flameDiameter - Diameter of the flame. [m]
-   * @param {number[]} options.poolZoneSEP - Surface emissive power from each of the two pool fire zones. [W/m2]
-   * @param {number} options.poolCentre - The downwind distance to the centre of the pool fire. [m]
-   * @param {Enums.FireType} options.fireType - Type of fire. (default value is Enums.FireType.NO_FIRE)
    * @param {number} options.liftOffHeight - Fireball centre height. [m]
    * @param {number} options.liftOffTime - Time to lift off. [s]
+   * @param {number[]} options.poolZoneSEP - Surface emissive power from each of the two pool fire zones. [W/m2]
+   * @param {number} options.poolCentre - Location downwind of the centre of the pool. [m]
    */
   constructor(options?: {
     id?: string;
@@ -2789,24 +2938,24 @@ export class PoolFireFlameResult extends FlameResult {
     displayName?: string;
     time?: number;
     surfaceEmissivePower?: number;
+    fireType?: Enums.FireType;
     flameLength?: number;
     flameDiameter?: number;
-    poolZoneSEP?: number[];
-    poolCentre?: number;
-    fireType?: Enums.FireType;
     liftOffHeight?: number;
     liftOffTime?: number;
+    poolZoneSEP?: number[];
+    poolCentre?: number;
   }) {
     super(options);
-    this.poolZoneSEP = options?.poolZoneSEP;
+    this.poolZoneSEP = options?.poolZoneSEP ?? [];
     this.poolCentre = options?.poolCentre;
   }
 
   /** Initialise the entity with data from a dictionary. */
   initialiseFromDictionary(data: { [key: string]: unknown }) {
     super.initialiseFromDictionary(data);
-    if (data.poolZoneSEP && Array.isArray(data.poolZoneSEP)) {
-      this.poolZoneSEP = (data.poolZoneSEP ?? []).map((item) => parseFloat(item));
+    if (data.poolZoneSEP !== undefined && Array.isArray(data.poolZoneSEP)) {
+      this.poolZoneSEP = data.poolZoneSEP as number[];
     }
     if (data.poolCentre !== undefined && typeof data.poolCentre === 'number') {
       this.poolCentre = data.poolCentre as number;
@@ -2819,13 +2968,13 @@ export class PoolFireFlameResult extends FlameResult {
       '* PoolFireFlameResult',
       `time:    ${this.time}`,
       `surfaceEmissivePower:    ${this.surfaceEmissivePower}`,
+      `fireType:    ${this.fireType}`,
       `flameLength:    ${this.flameLength}`,
       `flameDiameter:    ${this.flameDiameter}`,
-      this.poolZoneSEP?.map((item) => item?.toString()).join('\n'),
-      `poolCentre:    ${this.poolCentre}`,
-      `fireType:    ${this.fireType}`,
       `liftOffHeight:    ${this.liftOffHeight}`,
       `liftOffTime:    ${this.liftOffTime}`,
+      `poolZoneSEP:    ${this.poolZoneSEP}`,
+      `poolCentre:    ${this.poolCentre}`,
     ];
     return parts.join('\n');
   }
@@ -2845,7 +2994,6 @@ export class PoolRecord extends EntityBase {
   spillRate?: number;
   actualRadius?: number;
   poolCentre?: number;
-
   /**
    * A record containing pool results at a given time.
    *
@@ -2968,7 +3116,6 @@ export class PoolVapourisationParameters extends EntityBase {
   toxicsCutoffRate: number;
   flammableCutoffRate: number;
   relativeTolerance: number;
-
   /**
    * Pool vapourisation parameters.
    *
@@ -3012,22 +3159,21 @@ export class PoolVapourisationParameters extends EntityBase {
 
 export class RadiationRecord extends EntityBase {
   position: LocalPosition;
-  radiationResult?: number;
   radiationType?: Enums.RadiationType;
-
+  radiationResult?: number;
   /**
    * A record of the radiation type and level at a specific point (x,y,z).
    *
    * @param {Object} options - Initialisation options
    * @param {LocalPosition} options.position - Cartesian coordinates of a point of interest.
-   * @param {number} options.radiationResult - The value for the RadiationType at the specified position.
    * @param {Enums.RadiationType} options.radiationType - The type of radiation result of interest. (default value is Enums.RadiationType.UNSET)
+   * @param {number} options.radiationResult - The value for the RadiationType at the specified position.
    */
-  constructor(options?: { id?: string; typeId?: string; displayName?: string; position?: LocalPosition; radiationResult?: number; radiationType?: Enums.RadiationType }) {
+  constructor(options?: { id?: string; typeId?: string; displayName?: string; position?: LocalPosition; radiationType?: Enums.RadiationType; radiationResult?: number }) {
     super(options?.id, options?.typeId, options?.displayName);
     this.position = options?.position ?? new LocalPosition();
-    this.radiationResult = options?.radiationResult;
     this.radiationType = options?.radiationType ?? Enums.RadiationType.UNSET;
+    this.radiationResult = options?.radiationResult;
   }
 
   /** Initialise the entity with data from a dictionary. */
@@ -3037,15 +3183,15 @@ export class RadiationRecord extends EntityBase {
       this.position = new LocalPosition();
       this.position.initialiseFromDictionary(data.position as { [key: string]: unknown });
     }
-    if (data.radiationResult !== undefined && typeof data.radiationResult === 'number') {
-      this.radiationResult = data.radiationResult as number;
-    }
     if (data.radiationType !== undefined && (typeof data.radiationType === 'string' || typeof data.radiationType === 'number')) {
       this.radiationType = this.parseEnumValue(data.radiationType, Enums.RadiationType);
     }
+    if (data.radiationResult !== undefined && typeof data.radiationResult === 'number') {
+      this.radiationResult = data.radiationResult as number;
+    }
   }
 
-  private parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
+  protected parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
     if (typeof value === 'string' && value in enumType) {
       return enumType[value as keyof T];
     } else if (typeof value === 'number' && Object.values(enumType).includes(value)) {
@@ -3055,7 +3201,7 @@ export class RadiationRecord extends EntityBase {
   }
 
   toString() {
-    const parts = [super.toString(), '* RadiationRecord', `position:    ${this.position?.toString()}`, `radiationResult:    ${this.radiationResult}`, `radiationType:    ${this.radiationType}`];
+    const parts = [super.toString(), '* RadiationRecord', `position:    ${this.position?.toString()}`, `radiationType:    ${this.radiationType}`, `radiationResult:    ${this.radiationResult}`];
     return parts.join('\n');
   }
 }
@@ -3066,16 +3212,15 @@ export class ReliefValve extends ReleaseOverTime {
   pipeLength?: number;
   pipeRoughness: number;
   pipeHeightFraction: number;
-
   /**
    * A storage scenario which models a release of material from the vapour side of a vessel due to the lifting of a relief valve.
    *
    * @param {Object} options - Initialisation options
+   * @param {number} options.releaseAngle - Angle of release above a horizontal plane. [rad] (default value is 0.0)
+   * @param {Enums.TimeVaryingOption} options.timeVaryingOption - Whether the release is a time-varying release or a steady state release using the initial rate. (default value is Enums.TimeVaryingOption.INITIAL_RATE)
    * @param {number} options.reliefValveConstrictionDiameter - Constriction at the upstream end of the pipe. [m]
    * @param {number} options.pipeDiameter - Internal diameter of the short pipe. [m]
    * @param {number} options.pipeLength - Length of the short pipe. [m]
-   * @param {number} options.releaseAngle - Angle of release above a horizontal plane. [rad] (default value is 0.0)
-   * @param {Enums.TimeVaryingOption} options.timeVaryingOption - Whether the release is a time-varying release or a steady state release using the initial rate. (default value is Enums.TimeVaryingOption.INITIAL_RATE)
    * @param {number} options.pipeRoughness - Roughness of the short pipe. [m] (default value is 0.000045)
    * @param {number} options.pipeHeightFraction - Location of the pipe connection above the base of the vessel. [fraction] (default value is 0.5)
    */
@@ -3083,11 +3228,11 @@ export class ReliefValve extends ReleaseOverTime {
     id?: string;
     typeId?: string;
     displayName?: string;
+    releaseAngle?: number;
+    timeVaryingOption?: Enums.TimeVaryingOption;
     reliefValveConstrictionDiameter?: number;
     pipeDiameter?: number;
     pipeLength?: number;
-    releaseAngle?: number;
-    timeVaryingOption?: Enums.TimeVaryingOption;
     pipeRoughness?: number;
     pipeHeightFraction?: number;
   }) {
@@ -3123,11 +3268,11 @@ export class ReliefValve extends ReleaseOverTime {
     const parts = [
       super.toString(),
       '* ReliefValve',
+      `releaseAngle:    ${this.releaseAngle}`,
+      `timeVaryingOption:    ${this.timeVaryingOption}`,
       `reliefValveConstrictionDiameter:    ${this.reliefValveConstrictionDiameter}`,
       `pipeDiameter:    ${this.pipeDiameter}`,
       `pipeLength:    ${this.pipeLength}`,
-      `releaseAngle:    ${this.releaseAngle}`,
-      `timeVaryingOption:    ${this.timeVaryingOption}`,
       `pipeRoughness:    ${this.pipeRoughness}`,
       `pipeHeightFraction:    ${this.pipeHeightFraction}`,
     ];
@@ -3142,16 +3287,15 @@ export class SafetySystem extends EntityBase {
   blowdownTime: number;
   blowdownSuccess: boolean;
   blowdownValveSize: number;
-
   /**
    * A safety system entity which defines isolation and blowdown settings for a pressurised vessel.
    *
    * @param {Object} options - Initialisation options
    * @param {number} options.isolationTime - Time from start of release to failed or successful isolation. [s] (default value is 0.0)
-   * @param {boolean} options.isolationSuccess - Does isolation succeed?. (default value is true)
+   * @param {boolean} options.isolationSuccess - Does isolation succeed?. (default value is True)
    * @param {number} options.massAddedIsolationFailure - Upstream mass to add in case of isolation failure. [kg] (default value is 0.0)
    * @param {number} options.blowdownTime - Time from start of release to failed or successful blowdown. [s] (default value is 0.0)
-   * @param {boolean} options.blowdownSuccess - Does blowdown succeed?. (default value is false)
+   * @param {boolean} options.blowdownSuccess - Does blowdown succeed?. (default value is False)
    * @param {number} options.blowdownValveSize - Diameter of blowdown valve. [m] (default value is 0.025)
    */
   constructor(options?: {
@@ -3215,23 +3359,22 @@ export class SafetySystem extends EntityBase {
 export class ScalarUdmOutputs extends EntityBase {
   observerCount?: number;
   recordCount?: number;
+  cloudType?: Enums.DynamicType;
   minimumConcentration?: number;
   windPower?: number;
   frictionVelocity?: number;
   dispersionReleaseDuration?: number;
-  cloudType?: Enums.DynamicType;
-
   /**
    * Scalar UDM output values required for post processing dispersion results.
    *
    * @param {Object} options - Initialisation options
    * @param {number} options.observerCount - Number of observers either from the release or from the pool.
    * @param {number} options.recordCount - Number of total dispersion records from all observers.
+   * @param {Enums.DynamicType} options.cloudType - Type of release or cloud. (default value is Enums.DynamicType.UNSET)
    * @param {number} options.minimumConcentration - Minimum concentration to which dispersion calculations have been performed. [fraction]
    * @param {number} options.windPower - A wind profile exponent describing how wind changes with height.
    * @param {number} options.frictionVelocity - The shear stress between the air and the ground. [m/s]
    * @param {number} options.dispersionReleaseDuration - The time at which the last observer is released. [s]
-   * @param {Enums.DynamicType} options.cloudType - Type of release or cloud. (default value is Enums.DynamicType.UNSET)
    */
   constructor(options?: {
     id?: string;
@@ -3239,20 +3382,20 @@ export class ScalarUdmOutputs extends EntityBase {
     displayName?: string;
     observerCount?: number;
     recordCount?: number;
+    cloudType?: Enums.DynamicType;
     minimumConcentration?: number;
     windPower?: number;
     frictionVelocity?: number;
     dispersionReleaseDuration?: number;
-    cloudType?: Enums.DynamicType;
   }) {
     super(options?.id, options?.typeId, options?.displayName);
     this.observerCount = options?.observerCount;
     this.recordCount = options?.recordCount;
+    this.cloudType = options?.cloudType ?? Enums.DynamicType.UNSET;
     this.minimumConcentration = options?.minimumConcentration;
     this.windPower = options?.windPower;
     this.frictionVelocity = options?.frictionVelocity;
     this.dispersionReleaseDuration = options?.dispersionReleaseDuration;
-    this.cloudType = options?.cloudType ?? Enums.DynamicType.UNSET;
   }
 
   /** Initialise the entity with data from a dictionary. */
@@ -3264,6 +3407,9 @@ export class ScalarUdmOutputs extends EntityBase {
     if (data.recordCount !== undefined && typeof data.recordCount === 'number') {
       this.recordCount = data.recordCount as number;
     }
+    if (data.cloudType !== undefined && (typeof data.cloudType === 'string' || typeof data.cloudType === 'number')) {
+      this.cloudType = this.parseEnumValue(data.cloudType, Enums.DynamicType);
+    }
     if (data.minimumConcentration !== undefined && typeof data.minimumConcentration === 'number') {
       this.minimumConcentration = data.minimumConcentration as number;
     }
@@ -3276,12 +3422,9 @@ export class ScalarUdmOutputs extends EntityBase {
     if (data.dispersionReleaseDuration !== undefined && typeof data.dispersionReleaseDuration === 'number') {
       this.dispersionReleaseDuration = data.dispersionReleaseDuration as number;
     }
-    if (data.cloudType !== undefined && (typeof data.cloudType === 'string' || typeof data.cloudType === 'number')) {
-      this.cloudType = this.parseEnumValue(data.cloudType, Enums.DynamicType);
-    }
   }
 
-  private parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
+  protected parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
     if (typeof value === 'string' && value in enumType) {
       return enumType[value as keyof T];
     } else if (typeof value === 'number' && Object.values(enumType).includes(value)) {
@@ -3296,11 +3439,11 @@ export class ScalarUdmOutputs extends EntityBase {
       '* ScalarUdmOutputs',
       `observerCount:    ${this.observerCount}`,
       `recordCount:    ${this.recordCount}`,
+      `cloudType:    ${this.cloudType}`,
       `minimumConcentration:    ${this.minimumConcentration}`,
       `windPower:    ${this.windPower}`,
       `frictionVelocity:    ${this.frictionVelocity}`,
       `dispersionReleaseDuration:    ${this.dispersionReleaseDuration}`,
-      `cloudType:    ${this.cloudType}`,
     ];
     return parts.join('\n');
   }
@@ -3311,15 +3454,14 @@ export class ShortPipeRupture extends ReleaseOverTime {
   pipeDiameter?: number;
   pipeRoughness: number;
   pipeHeightFraction: number;
-
   /**
    * Short pipe rupture scenario.
    *
    * @param {Object} options - Initialisation options
-   * @param {number} options.pipeLength - Length of short pipe. [m]
-   * @param {number} options.pipeDiameter - Inner diameter of the short pipe. [m]
    * @param {number} options.releaseAngle - Angle of release above a horizontal plane. [rad] (default value is 0.0)
    * @param {Enums.TimeVaryingOption} options.timeVaryingOption - Whether the release is a time-varying release or a steady state release using the initial rate. (default value is Enums.TimeVaryingOption.INITIAL_RATE)
+   * @param {number} options.pipeLength - Length of short pipe. [m]
+   * @param {number} options.pipeDiameter - Inner diameter of the short pipe. [m]
    * @param {number} options.pipeRoughness - Roughness of the short pipe. [m] (default value is 0.000045)
    * @param {number} options.pipeHeightFraction - Location of the pipe connection above the base of the vessel. [fraction] (default value is 0.5)
    */
@@ -3327,10 +3469,10 @@ export class ShortPipeRupture extends ReleaseOverTime {
     id?: string;
     typeId?: string;
     displayName?: string;
-    pipeLength?: number;
-    pipeDiameter?: number;
     releaseAngle?: number;
     timeVaryingOption?: Enums.TimeVaryingOption;
+    pipeLength?: number;
+    pipeDiameter?: number;
     pipeRoughness?: number;
     pipeHeightFraction?: number;
   }) {
@@ -3362,10 +3504,10 @@ export class ShortPipeRupture extends ReleaseOverTime {
     const parts = [
       super.toString(),
       '* ShortPipeRupture',
-      `pipeLength:    ${this.pipeLength}`,
-      `pipeDiameter:    ${this.pipeDiameter}`,
       `releaseAngle:    ${this.releaseAngle}`,
       `timeVaryingOption:    ${this.timeVaryingOption}`,
+      `pipeLength:    ${this.pipeLength}`,
+      `pipeDiameter:    ${this.pipeDiameter}`,
       `pipeRoughness:    ${this.pipeRoughness}`,
       `pipeHeightFraction:    ${this.pipeHeightFraction}`,
     ];
@@ -3376,7 +3518,6 @@ export class ShortPipeRupture extends ReleaseOverTime {
 export class Structure extends EntityBase {
   explosionConfinedVolume: ExplosionConfinedVolume;
   location: LocalPosition;
-
   /**
    * A building or process plant structure.
    *
@@ -3410,35 +3551,30 @@ export class Structure extends EntityBase {
 }
 
 export class Substrate extends EntityBase {
-  bund: Bund;
   surfaceRoughness: number;
   surfaceType?: Enums.SurfaceType;
   poolSurfaceType?: Enums.PoolSurfaceType;
-
+  bund: Bund;
   /**
    * The ground over which a release is taking place.
    *
    * @param {Object} options - Initialisation options
-   * @param {Bund} options.bund - A bund entity used in the modelling of pool spreading and vaporisation.
    * @param {number} options.surfaceRoughness - The height above the ground below which the wind speed is theoretically zero due to friction from the surface. [m] (default value is 0.183)
    * @param {Enums.SurfaceType} options.surfaceType - Surface over which the dispersion occurs. (default value is Enums.SurfaceType.LAND)
    * @param {Enums.PoolSurfaceType} options.poolSurfaceType - Surface onto which the liquid which rains out will spread. (default value is Enums.PoolSurfaceType.CONCRETE)
+   * @param {Bund} options.bund - A bund entity used in the modelling of pool spreading and vaporisation.
    */
-  constructor(options?: { id?: string; typeId?: string; displayName?: string; bund?: Bund; surfaceRoughness?: number; surfaceType?: Enums.SurfaceType; poolSurfaceType?: Enums.PoolSurfaceType }) {
+  constructor(options?: { id?: string; typeId?: string; displayName?: string; surfaceRoughness?: number; surfaceType?: Enums.SurfaceType; poolSurfaceType?: Enums.PoolSurfaceType; bund?: Bund }) {
     super(options?.id, options?.typeId, options?.displayName);
-    this.bund = options?.bund ?? new Bund();
     this.surfaceRoughness = options?.surfaceRoughness ?? 0.183;
     this.surfaceType = options?.surfaceType ?? Enums.SurfaceType.LAND;
     this.poolSurfaceType = options?.poolSurfaceType ?? Enums.PoolSurfaceType.CONCRETE;
+    this.bund = options?.bund ?? new Bund();
   }
 
   /** Initialise the entity with data from a dictionary. */
   initialiseFromDictionary(data: { [key: string]: unknown }) {
     super.initialiseFromDictionary(data);
-    if (data.bund) {
-      this.bund = new Bund();
-      this.bund.initialiseFromDictionary(data.bund as { [key: string]: unknown });
-    }
     if (data.surfaceRoughness !== undefined && typeof data.surfaceRoughness === 'number') {
       this.surfaceRoughness = data.surfaceRoughness as number;
     }
@@ -3448,9 +3584,13 @@ export class Substrate extends EntityBase {
     if (data.poolSurfaceType !== undefined && (typeof data.poolSurfaceType === 'string' || typeof data.poolSurfaceType === 'number')) {
       this.poolSurfaceType = this.parseEnumValue(data.poolSurfaceType, Enums.PoolSurfaceType);
     }
+    if (data.bund) {
+      this.bund = new Bund();
+      this.bund.initialiseFromDictionary(data.bund as { [key: string]: unknown });
+    }
   }
 
-  private parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
+  protected parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
     if (typeof value === 'string' && value in enumType) {
       return enumType[value as keyof T];
     } else if (typeof value === 'number' && Object.values(enumType).includes(value)) {
@@ -3463,10 +3603,10 @@ export class Substrate extends EntityBase {
     const parts = [
       super.toString(),
       '* Substrate',
-      `bund:    ${this.bund?.toString()}`,
       `surfaceRoughness:    ${this.surfaceRoughness}`,
       `surfaceType:    ${this.surfaceType}`,
       `poolSurfaceType:    ${this.poolSurfaceType}`,
+      `bund:    ${this.bund?.toString()}`,
     ];
     return parts.join('\n');
   }
@@ -3474,22 +3614,21 @@ export class Substrate extends EntityBase {
 
 export class ToxicRecord extends EntityBase {
   position: LocalPosition;
-  toxicResult?: number;
   toxicResultType?: Enums.ToxicResultType;
-
+  toxicResult?: number;
   /**
    * A record of the toxic result type and level at a specific point (x,y,z).
    *
    * @param {Object} options - Initialisation options
    * @param {LocalPosition} options.position - Cartesian coordinates of a point of interest.
-   * @param {number} options.toxicResult - The value for the ToxicResultType at the specified position.
    * @param {Enums.ToxicResultType} options.toxicResultType - The type of toxic result. (default value is Enums.ToxicResultType.UNSET)
+   * @param {number} options.toxicResult - The value for the ToxicResultType at the specified position.
    */
-  constructor(options?: { id?: string; typeId?: string; displayName?: string; position?: LocalPosition; toxicResult?: number; toxicResultType?: Enums.ToxicResultType }) {
+  constructor(options?: { id?: string; typeId?: string; displayName?: string; position?: LocalPosition; toxicResultType?: Enums.ToxicResultType; toxicResult?: number }) {
     super(options?.id, options?.typeId, options?.displayName);
     this.position = options?.position ?? new LocalPosition();
-    this.toxicResult = options?.toxicResult;
     this.toxicResultType = options?.toxicResultType ?? Enums.ToxicResultType.UNSET;
+    this.toxicResult = options?.toxicResult;
   }
 
   /** Initialise the entity with data from a dictionary. */
@@ -3499,15 +3638,15 @@ export class ToxicRecord extends EntityBase {
       this.position = new LocalPosition();
       this.position.initialiseFromDictionary(data.position as { [key: string]: unknown });
     }
-    if (data.toxicResult !== undefined && typeof data.toxicResult === 'number') {
-      this.toxicResult = data.toxicResult as number;
-    }
     if (data.toxicResultType !== undefined && (typeof data.toxicResultType === 'string' || typeof data.toxicResultType === 'number')) {
       this.toxicResultType = this.parseEnumValue(data.toxicResultType, Enums.ToxicResultType);
     }
+    if (data.toxicResult !== undefined && typeof data.toxicResult === 'number') {
+      this.toxicResult = data.toxicResult as number;
+    }
   }
 
-  private parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
+  protected parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
     if (typeof value === 'string' && value in enumType) {
       return enumType[value as keyof T];
     } else if (typeof value === 'number' && Object.values(enumType).includes(value)) {
@@ -3517,38 +3656,37 @@ export class ToxicRecord extends EntityBase {
   }
 
   toString() {
-    const parts = [super.toString(), '* ToxicRecord', `position:    ${this.position?.toString()}`, `toxicResult:    ${this.toxicResult}`, `toxicResultType:    ${this.toxicResultType}`];
+    const parts = [super.toString(), '* ToxicRecord', `position:    ${this.position?.toString()}`, `toxicResultType:    ${this.toxicResultType}`, `toxicResult:    ${this.toxicResult}`];
     return parts.join('\n');
   }
 }
 
 export class Vessel extends Asset {
   state: State;
-  material: Material;
-  safetySystem: SafetySystem;
   diameter: number;
   height: number;
   length: number;
   width: number;
   shape?: Enums.VesselShape;
+  material: Material;
   vesselConditions?: Enums.VesselConditions;
   liquidFillFractionByVolume: number;
-
+  safetySystem: SafetySystem;
   /**
    * A pressue vessel asset to represent pressurised containment.
    *
    * @param {Object} options - Initialisation options
    * @param {LocalPosition} options.location - Location of the asset.
    * @param {State} options.state - Fluid state in the vessel.
-   * @param {Material} options.material - Material in the vessel.
-   * @param {SafetySystem} options.safetySystem - A safety system entity which defines isolation and blowdown settings for a pressurised vessel.
    * @param {number} options.diameter - Internal diameter of the vessel. [m] (default value is 2)
    * @param {number} options.height - Internal height of a VerticalCylinder or VesselCuboid. [m] (default value is 4)
    * @param {number} options.length - Internal length of HorizontalCylinder or VesselCuboid. [m] (default value is 4)
    * @param {number} options.width - Internal width of a VesselCuboid. [m] (default value is 2.0)
    * @param {Enums.VesselShape} options.shape - Shape of the vessel. (default value is Enums.VesselShape.HORIZONTAL_CYLINDER)
+   * @param {Material} options.material - Material in the vessel.
    * @param {Enums.VesselConditions} options.vesselConditions - The conditions inside the vessel. (default value is Enums.VesselConditions.UNSET)
    * @param {number} options.liquidFillFractionByVolume - The proportion of the vessel occupied by liquid. Used when the VesselConditions are two-phase or pressurized liquid. [fraction] (default value is 0.0)
+   * @param {SafetySystem} options.safetySystem - A safety system entity which defines isolation and blowdown settings for a pressurised vessel.
    */
   constructor(options?: {
     id?: string;
@@ -3556,27 +3694,27 @@ export class Vessel extends Asset {
     displayName?: string;
     location?: LocalPosition;
     state?: State;
-    material?: Material;
-    safetySystem?: SafetySystem;
     diameter?: number;
     height?: number;
     length?: number;
     width?: number;
     shape?: Enums.VesselShape;
+    material?: Material;
     vesselConditions?: Enums.VesselConditions;
     liquidFillFractionByVolume?: number;
+    safetySystem?: SafetySystem;
   }) {
     super(options);
     this.state = options?.state ?? new State();
-    this.material = options?.material ?? new Material();
-    this.safetySystem = options?.safetySystem ?? new SafetySystem();
     this.diameter = options?.diameter ?? 2;
     this.height = options?.height ?? 4;
     this.length = options?.length ?? 4;
     this.width = options?.width ?? 2.0;
     this.shape = options?.shape ?? Enums.VesselShape.HORIZONTAL_CYLINDER;
+    this.material = options?.material ?? new Material();
     this.vesselConditions = options?.vesselConditions ?? Enums.VesselConditions.UNSET;
     this.liquidFillFractionByVolume = options?.liquidFillFractionByVolume ?? 0.0;
+    this.safetySystem = options?.safetySystem ?? new SafetySystem();
   }
 
   /** Initialise the entity with data from a dictionary. */
@@ -3586,14 +3724,6 @@ export class Vessel extends Asset {
       this.state = new State();
       this.state.initialiseFromDictionary(data.state as { [key: string]: unknown });
     }
-    if (data.material) {
-      this.material = new Material();
-      this.material.initialiseFromDictionary(data.material as { [key: string]: unknown });
-    }
-    if (data.safetySystem) {
-      this.safetySystem = new SafetySystem();
-      this.safetySystem.initialiseFromDictionary(data.safetySystem as { [key: string]: unknown });
-    }
     if (data.diameter !== undefined && typeof data.diameter === 'number') {
       this.diameter = data.diameter as number;
     }
@@ -3609,15 +3739,23 @@ export class Vessel extends Asset {
     if (data.shape !== undefined && (typeof data.shape === 'string' || typeof data.shape === 'number')) {
       this.shape = this.parseEnumValue(data.shape, Enums.VesselShape);
     }
+    if (data.material) {
+      this.material = new Material();
+      this.material.initialiseFromDictionary(data.material as { [key: string]: unknown });
+    }
     if (data.vesselConditions !== undefined && (typeof data.vesselConditions === 'string' || typeof data.vesselConditions === 'number')) {
       this.vesselConditions = this.parseEnumValue(data.vesselConditions, Enums.VesselConditions);
     }
     if (data.liquidFillFractionByVolume !== undefined && typeof data.liquidFillFractionByVolume === 'number') {
       this.liquidFillFractionByVolume = data.liquidFillFractionByVolume as number;
     }
+    if (data.safetySystem) {
+      this.safetySystem = new SafetySystem();
+      this.safetySystem.initialiseFromDictionary(data.safetySystem as { [key: string]: unknown });
+    }
   }
 
-  private parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
+  protected parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
     if (typeof value === 'string' && value in enumType) {
       return enumType[value as keyof T];
     } else if (typeof value === 'number' && Object.values(enumType).includes(value)) {
@@ -3632,15 +3770,15 @@ export class Vessel extends Asset {
       '* Vessel',
       `location:    ${this.location?.toString()}`,
       `state:    ${this.state?.toString()}`,
-      `material:    ${this.material?.toString()}`,
-      `safetySystem:    ${this.safetySystem?.toString()}`,
       `diameter:    ${this.diameter}`,
       `height:    ${this.height}`,
       `length:    ${this.length}`,
       `width:    ${this.width}`,
       `shape:    ${this.shape}`,
+      `material:    ${this.material?.toString()}`,
       `vesselConditions:    ${this.vesselConditions}`,
       `liquidFillFractionByVolume:    ${this.liquidFillFractionByVolume}`,
+      `safetySystem:    ${this.safetySystem?.toString()}`,
     ];
     return parts.join('\n');
   }
@@ -3649,21 +3787,20 @@ export class Vessel extends Asset {
 export class VesselLeakMaxFlammableCloudResults extends EntityBase {
   dischargeRate?: number;
   expandedTemperature?: number;
+  phase?: Enums.Phase;
   lflExtent?: number;
   lflArea?: number;
   lflHeight?: number;
-  phase?: Enums.Phase;
-
   /**
    * Results for a linked run of vessel leak followed by dispersion and views from the cloud.
    *
    * @param {Object} options - Initialisation options
    * @param {number} options.dischargeRate - Mass flow rate from the leak. [kg/s]
    * @param {number} options.expandedTemperature - Post atmospheric expansion temperature. [K]
+   * @param {Enums.Phase} options.phase - Post atmospheric expansion fluid phase. (default value is Enums.Phase.UNSET)
    * @param {number} options.lflExtent - Maximum downwind distance to LFL. [m]
    * @param {number} options.lflArea - Horizontal area of the LFL envelope. [m2]
    * @param {number} options.lflHeight - Height of the maximum LFL extent. [m]
-   * @param {Enums.Phase} options.phase - Post atmospheric expansion fluid phase. (default value is Enums.Phase.UNSET)
    */
   constructor(options?: {
     id?: string;
@@ -3671,18 +3808,18 @@ export class VesselLeakMaxFlammableCloudResults extends EntityBase {
     displayName?: string;
     dischargeRate?: number;
     expandedTemperature?: number;
+    phase?: Enums.Phase;
     lflExtent?: number;
     lflArea?: number;
     lflHeight?: number;
-    phase?: Enums.Phase;
   }) {
     super(options?.id, options?.typeId, options?.displayName);
     this.dischargeRate = options?.dischargeRate;
     this.expandedTemperature = options?.expandedTemperature;
+    this.phase = options?.phase ?? Enums.Phase.UNSET;
     this.lflExtent = options?.lflExtent;
     this.lflArea = options?.lflArea;
     this.lflHeight = options?.lflHeight;
-    this.phase = options?.phase ?? Enums.Phase.UNSET;
   }
 
   /** Initialise the entity with data from a dictionary. */
@@ -3694,6 +3831,9 @@ export class VesselLeakMaxFlammableCloudResults extends EntityBase {
     if (data.expandedTemperature !== undefined && typeof data.expandedTemperature === 'number') {
       this.expandedTemperature = data.expandedTemperature as number;
     }
+    if (data.phase !== undefined && (typeof data.phase === 'string' || typeof data.phase === 'number')) {
+      this.phase = this.parseEnumValue(data.phase, Enums.Phase);
+    }
     if (data.lflExtent !== undefined && typeof data.lflExtent === 'number') {
       this.lflExtent = data.lflExtent as number;
     }
@@ -3703,12 +3843,9 @@ export class VesselLeakMaxFlammableCloudResults extends EntityBase {
     if (data.lflHeight !== undefined && typeof data.lflHeight === 'number') {
       this.lflHeight = data.lflHeight as number;
     }
-    if (data.phase !== undefined && (typeof data.phase === 'string' || typeof data.phase === 'number')) {
-      this.phase = this.parseEnumValue(data.phase, Enums.Phase);
-    }
   }
 
-  private parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
+  protected parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
     if (typeof value === 'string' && value in enumType) {
       return enumType[value as keyof T];
     } else if (typeof value === 'number' && Object.values(enumType).includes(value)) {
@@ -3723,10 +3860,10 @@ export class VesselLeakMaxFlammableCloudResults extends EntityBase {
       '* VesselLeakMaxFlammableCloudResults',
       `dischargeRate:    ${this.dischargeRate}`,
       `expandedTemperature:    ${this.expandedTemperature}`,
+      `phase:    ${this.phase}`,
       `lflExtent:    ${this.lflExtent}`,
       `lflArea:    ${this.lflArea}`,
       `lflHeight:    ${this.lflHeight}`,
-      `phase:    ${this.phase}`,
     ];
     return parts.join('\n');
   }
@@ -3736,7 +3873,6 @@ export class VesselSphere extends Asset {
   state: State;
   material: Material;
   massInventory?: number;
-
   /**
    * A spherical pressue vessel asset to represent pressurised containment.
    *
@@ -3790,7 +3926,6 @@ export class Weather extends EntityBase {
   mixingLayerHeight: number;
   solarRadiation: number;
   windProfileFlag?: Enums.WindProfileFlag;
-
   /**
    * A set of weather conditions for use in the modelling of a release and its effects.
    *
@@ -3851,7 +3986,7 @@ export class Weather extends EntityBase {
     }
   }
 
-  private parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
+  protected parseEnumValue<T extends object>(value: unknown, enumType: T): T[keyof T] | undefined {
     if (typeof value === 'string' && value in enumType) {
       return enumType[value as keyof T];
     } else if (typeof value === 'number' && Object.values(enumType).includes(value)) {