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

package/src/entity-schemas.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/entityschemas.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/entity_schemas.sbn.
+// *
+// ************************************************************************************
 
 import * as Enums from './enums';
 import * as Entities from './entities';
@@ -129,7 +133,7 @@ export interface AssetSchemaData extends SchemaBaseData {
 /**
  * ================================================================================
  * Class:        AssetSchema
- * Description:  Any equipment to be modeled, vessels, pipelines
+ * Description:  Any equipment to be modeled, vessels, pipelines.
  * ================================================================================
  */
 export class AssetSchema extends SchemaBase<AssetSchemaData> {
@@ -194,9 +198,9 @@ export class MaterialComponentSchema extends SchemaBase<MaterialComponentSchemaD
 }
 
 export interface MaterialSchemaData extends SchemaBaseData {
-  components: Entities.MaterialComponent[];
   name: string;
   componentCount: number;
+  components: Entities.MaterialComponent[];
   propertyTemplate: Enums.PropertyTemplate;
 }
 
@@ -213,9 +217,9 @@ export class MaterialSchema extends SchemaBase<MaterialSchemaData> {
     this.schema = this.schema
       .concat(
         Joi.object({
-          components: Joi.array().items(new MaterialComponentSchema().schema).allow(null),
           name: Joi.string().allow(''),
           componentCount: Joi.number().integer(),
+          components: Joi.array().items(new MaterialComponentSchema().schema).allow(null),
           propertyTemplate: Joi.string().valid(
             ...Object.values(Enums.PropertyTemplate)
               .filter((v) => typeof v === 'number')
@@ -228,9 +232,9 @@ export class MaterialSchema extends SchemaBase<MaterialSchemaData> {
 
     this.propertyTypes = {
       ...this.propertyTypes,
-      components: 'MaterialComponent[]',
       name: 'string',
       componentCount: 'number',
+      components: 'MaterialComponent[]',
       propertyTemplate: 'Enums.PropertyTemplate',
     };
   }
@@ -412,18 +416,18 @@ export class ReleaseOverTimeSchema extends SchemaBase<ReleaseOverTimeSchemaData>
 }
 
 export interface BESSReleaseSchemaData extends SchemaBaseData {
+  releaseAngle: number;
+  timeVaryingOption: Enums.TimeVaryingOption;
   height: number;
-  area: number;
+  ventArea: number;
   temperature: number;
   duration: number;
-  releaseAngle: number;
-  timeVaryingOption: Enums.TimeVaryingOption;
 }
 
 /**
  * ================================================================================
  * Class:        BESSReleaseSchema
- * Description:  A release from a BESS unit in thermal runaway
+ * Description:  A release from a BESS unit in thermal runaway.
  * ================================================================================
  */
 export class BESSReleaseSchema extends SchemaBase<BESSReleaseSchemaData> {
@@ -433,16 +437,16 @@ export class BESSReleaseSchema extends SchemaBase<BESSReleaseSchemaData> {
     this.schema = this.schema
       .concat(
         Joi.object({
-          height: Joi.number().unsafe(),
-          area: Joi.number().unsafe(),
-          temperature: Joi.number().unsafe(),
-          duration: Joi.number().unsafe(),
           releaseAngle: Joi.number().unsafe(),
           timeVaryingOption: Joi.string().valid(
             ...Object.values(Enums.TimeVaryingOption)
               .filter((v) => typeof v === 'number')
               .sort(),
           ),
+          height: Joi.number().unsafe(),
+          ventArea: Joi.number().unsafe(),
+          temperature: Joi.number().unsafe(),
+          duration: Joi.number().unsafe(),
         }),
       )
       .pattern(ignoredPropertiesRegex, Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any()))
@@ -450,12 +454,12 @@ export class BESSReleaseSchema extends SchemaBase<BESSReleaseSchemaData> {
 
     this.propertyTypes = {
       ...this.propertyTypes,
+      releaseAngle: 'number',
+      timeVaryingOption: 'Enums.TimeVaryingOption',
       height: 'number',
-      area: 'number',
+      ventArea: 'number',
       temperature: 'number',
       duration: 'number',
-      releaseAngle: 'number',
-      timeVaryingOption: 'Enums.TimeVaryingOption',
     };
   }
 
@@ -464,16 +468,65 @@ export class BESSReleaseSchema extends SchemaBase<BESSReleaseSchemaData> {
   }
 }
 
+export interface OffGasCompositionSchemaData extends SchemaBaseData {
+  name: string;
+  componentCount: number;
+  components: Entities.MaterialComponent[];
+  propertyTemplate: Enums.PropertyTemplate;
+}
+
+/**
+ * ================================================================================
+ * Class:        OffGasCompositionSchema
+ * Description:  The off-gas composition to use in calculations.
+ * ================================================================================
+ */
+export class OffGasCompositionSchema extends SchemaBase<OffGasCompositionSchemaData> {
+  readonly typeName = 'OffGasComposition';
+  constructor() {
+    super();
+    this.schema = this.schema
+      .concat(
+        Joi.object({
+          name: Joi.string().allow(''),
+          componentCount: Joi.number().integer(),
+          components: Joi.array().items(new MaterialComponentSchema().schema).allow(null),
+          propertyTemplate: Joi.string().valid(
+            ...Object.values(Enums.PropertyTemplate)
+              .filter((v) => typeof v === 'number')
+              .sort(),
+          ),
+        }),
+      )
+      .pattern(ignoredPropertiesRegex, Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any()))
+      .unknown(true);
+
+    this.propertyTypes = {
+      ...this.propertyTypes,
+      name: 'string',
+      componentCount: 'number',
+      components: 'MaterialComponent[]',
+      propertyTemplate: 'Enums.PropertyTemplate',
+    };
+  }
+
+  makeEntity(data: OffGasCompositionSchemaData): Entities.OffGasComposition {
+    return new Entities.OffGasComposition(data);
+  }
+}
+
 export interface BESSUnitSchemaData extends SchemaBaseData {
   location: Entities.LocalPosition;
   energyCapacity: number;
   chemistry: Enums.BESSChemistry;
+  offGasComposition: Entities.OffGasComposition;
+  offGasVolume: number;
 }
 
 /**
  * ================================================================================
  * Class:        BESSUnitSchema
- * Description:  A BESS unit, containing Li-ion betteries
+ * Description:  A BESS unit, containing Li-ion betteries.
  * ================================================================================
  */
 export class BESSUnitSchema extends SchemaBase<BESSUnitSchemaData> {
@@ -490,6 +543,8 @@ export class BESSUnitSchema extends SchemaBase<BESSUnitSchemaData> {
               .filter((v) => typeof v === 'number')
               .sort(),
           ),
+          offGasComposition: new OffGasCompositionSchema().schema,
+          offGasVolume: Joi.number().unsafe(),
         }),
       )
       .pattern(ignoredPropertiesRegex, Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any()))
@@ -500,6 +555,8 @@ export class BESSUnitSchema extends SchemaBase<BESSUnitSchemaData> {
       location: 'LocalPosition',
       energyCapacity: 'number',
       chemistry: 'Enums.BESSChemistry',
+      offGasComposition: 'OffGasComposition',
+      offGasVolume: 'number',
     };
   }
 
@@ -508,6 +565,49 @@ export class BESSUnitSchema extends SchemaBase<BESSUnitSchemaData> {
   }
 }
 
+export interface BESSVolumeSchemaData extends SchemaBaseData {
+  volume: number;
+  isEstimate: boolean;
+  upperCI: number;
+  lowerCI: number;
+}
+
+/**
+ * ================================================================================
+ * Class:        BESSVolumeSchema
+ * Description:  Represents the off-gas volume for a calculation.
+ * ================================================================================
+ */
+export class BESSVolumeSchema extends SchemaBase<BESSVolumeSchemaData> {
+  readonly typeName = 'BESSVolume';
+  constructor() {
+    super();
+    this.schema = this.schema
+      .concat(
+        Joi.object({
+          volume: Joi.number().unsafe(),
+          isEstimate: Joi.boolean(),
+          upperCI: Joi.number().unsafe(),
+          lowerCI: Joi.number().unsafe(),
+        }),
+      )
+      .pattern(ignoredPropertiesRegex, Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any()))
+      .unknown(true);
+
+    this.propertyTypes = {
+      ...this.propertyTypes,
+      volume: 'number',
+      isEstimate: 'boolean',
+      upperCI: 'number',
+      lowerCI: 'number',
+    };
+  }
+
+  makeEntity(data: BESSVolumeSchemaData): Entities.BESSVolume {
+    return new Entities.BESSVolume(data);
+  }
+}
+
 export interface BundSchemaData extends SchemaBaseData {
   bundHeight: number;
   bundDiameter: number;
@@ -575,7 +675,10 @@ export class InstantaneousSchema extends SchemaBase<InstantaneousSchemaData> {
   }
 }
 
-export interface CatastrophicRuptureSchemaData extends SchemaBaseData {}
+export interface CatastrophicRuptureSchemaData extends SchemaBaseData {
+  useVesselBurstPressure: boolean;
+  vesselBurstPressure: number;
+}
 
 /**
  * ================================================================================
@@ -588,12 +691,19 @@ export class CatastrophicRuptureSchema extends SchemaBase<CatastrophicRuptureSch
   constructor() {
     super();
     this.schema = this.schema
-      .concat(Joi.object())
+      .concat(
+        Joi.object({
+          useVesselBurstPressure: Joi.boolean(),
+          vesselBurstPressure: Joi.number().unsafe(),
+        }),
+      )
       .pattern(ignoredPropertiesRegex, Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any()))
       .unknown(true);
 
     this.propertyTypes = {
       ...this.propertyTypes,
+      useVesselBurstPressure: 'boolean',
+      vesselBurstPressure: 'number',
     };
   }
 
@@ -648,7 +758,7 @@ export interface ConstantMaterialResultSchemaData extends SchemaBaseData {
 /**
  * ================================================================================
  * Class:        ConstantMaterialResultSchema
- * Description:  Constant material properties, i.e. critical pressure, temperature, molecular weight
+ * Description:  Constant material properties, i.e. critical pressure, temperature, molecular weight.
  * ================================================================================
  */
 export class ConstantMaterialResultSchema extends SchemaBase<ConstantMaterialResultSchemaData> {
@@ -681,6 +791,7 @@ export class ConstantMaterialResultSchema extends SchemaBase<ConstantMaterialRes
 
 export interface DischargeParametersSchemaData extends SchemaBaseData {
   flashAtOrifice: Enums.FlashAtOrifice;
+  maxReleaseDuration: number;
 }
 
 /**
@@ -701,6 +812,7 @@ export class DischargeParametersSchema extends SchemaBase<DischargeParametersSch
               .filter((v) => typeof v === 'number')
               .sort(),
           ),
+          maxReleaseDuration: Joi.number().unsafe(),
         }),
       )
       .pattern(ignoredPropertiesRegex, Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any()))
@@ -709,6 +821,7 @@ export class DischargeParametersSchema extends SchemaBase<DischargeParametersSch
     this.propertyTypes = {
       ...this.propertyTypes,
       flashAtOrifice: 'Enums.FlashAtOrifice',
+      maxReleaseDuration: 'number',
     };
   }
 
@@ -780,8 +893,8 @@ export interface DischargeResultSchemaData extends SchemaBaseData {
   releaseMass: number;
   height: number;
   angle: number;
-  holeDiameter: number;
   releaseType: Enums.DynamicType;
+  holeDiameter: number;
   preDilutionAirRate: number;
 }
 
@@ -802,12 +915,12 @@ export class DischargeResultSchema extends SchemaBase<DischargeResultSchemaData>
           releaseMass: Joi.number().unsafe(),
           height: Joi.number().unsafe(),
           angle: Joi.number().unsafe(),
-          holeDiameter: Joi.number().unsafe(),
           releaseType: Joi.string().valid(
             ...Object.values(Enums.DynamicType)
               .filter((v) => typeof v === 'number')
               .sort(),
           ),
+          holeDiameter: Joi.number().unsafe(),
           preDilutionAirRate: Joi.number().unsafe(),
         }),
       )
@@ -820,8 +933,8 @@ export class DischargeResultSchema extends SchemaBase<DischargeResultSchemaData>
       releaseMass: 'number',
       height: 'number',
       angle: 'number',
-      holeDiameter: 'number',
       releaseType: 'Enums.DynamicType',
+      holeDiameter: 'number',
       preDilutionAirRate: 'number',
     };
   }
@@ -841,7 +954,6 @@ export interface DispersionOutputConfigSchemaData extends SchemaBaseData {
   crosswindDistance: number;
   contourType: Enums.ContourType;
   lflFractionValue: number;
-  componentToTrackIndex: number;
   componentToTrackName: string;
 }
 
@@ -879,7 +991,6 @@ export class DispersionOutputConfigSchema extends SchemaBase<DispersionOutputCon
               .sort(),
           ),
           lflFractionValue: Joi.number().unsafe(),
-          componentToTrackIndex: Joi.number().integer(),
           componentToTrackName: Joi.string().allow(''),
         }),
       )
@@ -897,7 +1008,6 @@ export class DispersionOutputConfigSchema extends SchemaBase<DispersionOutputCon
       crosswindDistance: 'number',
       contourType: 'Enums.ContourType',
       lflFractionValue: 'number',
-      componentToTrackIndex: 'number',
       componentToTrackName: 'string',
     };
   }
@@ -918,6 +1028,10 @@ export interface DispersionParametersSchemaData extends SchemaBaseData {
   numberOfPoolObservers: number;
   averagingTime: number;
   lflFractionToStop: number;
+  maxReleaseDuration: number;
+  releaseAveragingMethod: Enums.ReleaseAveragingMethod;
+  firstTimeForBetweenTwoTimes: number;
+  secondTimeForBetweenTwoTimes: number;
 }
 
 /**
@@ -947,6 +1061,14 @@ export class DispersionParametersSchema extends SchemaBase<DispersionParametersS
           numberOfPoolObservers: Joi.number().integer(),
           averagingTime: Joi.number().unsafe(),
           lflFractionToStop: Joi.number().unsafe(),
+          maxReleaseDuration: Joi.number().unsafe(),
+          releaseAveragingMethod: Joi.string().valid(
+            ...Object.values(Enums.ReleaseAveragingMethod)
+              .filter((v) => typeof v === 'number')
+              .sort(),
+          ),
+          firstTimeForBetweenTwoTimes: Joi.number().unsafe(),
+          secondTimeForBetweenTwoTimes: Joi.number().unsafe(),
         }),
       )
       .pattern(ignoredPropertiesRegex, Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any()))
@@ -964,6 +1086,10 @@ export class DispersionParametersSchema extends SchemaBase<DispersionParametersS
       numberOfPoolObservers: 'number',
       averagingTime: 'number',
       lflFractionToStop: 'number',
+      maxReleaseDuration: 'number',
+      releaseAveragingMethod: 'Enums.ReleaseAveragingMethod',
+      firstTimeForBetweenTwoTimes: 'number',
+      secondTimeForBetweenTwoTimes: 'number',
     };
   }
 
@@ -989,6 +1115,7 @@ export interface DispersionRecordSchemaData extends SchemaBaseData {
   massConc: number;
   velocity: number;
   massFlow: number;
+  instCon: Enums.DynamicType;
   profileFlag: number;
   elevFlag: number;
   rhoCloud: number;
@@ -1001,7 +1128,6 @@ export interface DispersionRecordSchemaData extends SchemaBaseData {
   dropletHeight: number;
   dropletDistance: number;
   mass: number;
-  instCon: Enums.DynamicType;
 }
 
 /**
@@ -1033,6 +1159,11 @@ export class DispersionRecordSchema extends SchemaBase<DispersionRecordSchemaDat
           massConc: Joi.number().unsafe(),
           velocity: Joi.number().unsafe(),
           massFlow: Joi.number().unsafe(),
+          instCon: Joi.string().valid(
+            ...Object.values(Enums.DynamicType)
+              .filter((v) => typeof v === 'number')
+              .sort(),
+          ),
           profileFlag: Joi.number().integer(),
           elevFlag: Joi.number().integer(),
           rhoCloud: Joi.number().unsafe(),
@@ -1045,11 +1176,6 @@ export class DispersionRecordSchema extends SchemaBase<DispersionRecordSchemaDat
           dropletHeight: Joi.number().unsafe(),
           dropletDistance: Joi.number().unsafe(),
           mass: Joi.number().unsafe(),
-          instCon: Joi.string().valid(
-            ...Object.values(Enums.DynamicType)
-              .filter((v) => typeof v === 'number')
-              .sort(),
-          ),
         }),
       )
       .pattern(ignoredPropertiesRegex, Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any()))
@@ -1073,6 +1199,7 @@ export class DispersionRecordSchema extends SchemaBase<DispersionRecordSchemaDat
       massConc: 'number',
       velocity: 'number',
       massFlow: 'number',
+      instCon: 'Enums.DynamicType',
       profileFlag: 'number',
       elevFlag: 'number',
       rhoCloud: 'number',
@@ -1085,7 +1212,6 @@ export class DispersionRecordSchema extends SchemaBase<DispersionRecordSchemaDat
       dropletHeight: 'number',
       dropletDistance: 'number',
       mass: 'number',
-      instCon: 'Enums.DynamicType',
     };
   }
 
@@ -1133,7 +1259,7 @@ export class ExplosionConfinedVolumeSchema extends SchemaBase<ExplosionConfinedV
 
 export interface ExplosionOutputConfigSchemaData extends SchemaBaseData {
   overpressureLevel: number;
-  meConfinedMethod: Enums.MEConfinedMethod;
+  MEConfinedMethod: Enums.MEConfinedMethod;
 }
 
 /**
@@ -1150,7 +1276,7 @@ export class ExplosionOutputConfigSchema extends SchemaBase<ExplosionOutputConfi
       .concat(
         Joi.object({
           overpressureLevel: Joi.number().unsafe(),
-          meConfinedMethod: Joi.string().valid(
+          MEConfinedMethod: Joi.string().valid(
             ...Object.values(Enums.MEConfinedMethod)
               .filter((v) => typeof v === 'number')
               .sort(),
@@ -1163,7 +1289,7 @@ export class ExplosionOutputConfigSchema extends SchemaBase<ExplosionOutputConfi
     this.propertyTypes = {
       ...this.propertyTypes,
       overpressureLevel: 'number',
-      meConfinedMethod: 'Enums.MEConfinedMethod',
+      MEConfinedMethod: 'Enums.MEConfinedMethod',
     };
   }
 
@@ -1301,9 +1427,9 @@ export class FlameRecordSchema extends SchemaBase<FlameRecordSchemaData> {
 export interface FlameResultSchemaData extends SchemaBaseData {
   time: number;
   surfaceEmissivePower: number;
+  fireType: Enums.FireType;
   flameLength: number;
   flameDiameter: number;
-  fireType: Enums.FireType;
   liftOffHeight: number;
   liftOffTime: number;
 }
@@ -1323,13 +1449,13 @@ export class FlameResultSchema extends SchemaBase<FlameResultSchemaData> {
         Joi.object({
           time: Joi.number().unsafe(),
           surfaceEmissivePower: Joi.number().unsafe(),
-          flameLength: Joi.number().unsafe(),
-          flameDiameter: Joi.number().unsafe(),
           fireType: Joi.string().valid(
             ...Object.values(Enums.FireType)
               .filter((v) => typeof v === 'number')
               .sort(),
           ),
+          flameLength: Joi.number().unsafe(),
+          flameDiameter: Joi.number().unsafe(),
           liftOffHeight: Joi.number().unsafe(),
           liftOffTime: Joi.number().unsafe(),
         }),
@@ -1341,9 +1467,9 @@ export class FlameResultSchema extends SchemaBase<FlameResultSchemaData> {
       ...this.propertyTypes,
       time: 'number',
       surfaceEmissivePower: 'number',
+      fireType: 'Enums.FireType',
       flameLength: 'number',
       flameDiameter: 'number',
-      fireType: 'Enums.FireType',
       liftOffHeight: 'number',
       liftOffTime: 'number',
     };
@@ -1393,11 +1519,11 @@ export class TransectSchema extends SchemaBase<TransectSchemaData> {
 
 export interface FlammableOutputConfigSchemaData extends SchemaBaseData {
   position: Entities.LocalPosition;
-  transect: Entities.Transect;
   radiationType: Enums.RadiationType;
   contourType: Enums.ContourType;
   radiationLevel: number;
   radiationResolution: Enums.Resolution;
+  transect: Entities.Transect;
   fixedOrientation: number;
   orientation: number;
   fixedInclination: number;
@@ -1418,7 +1544,6 @@ export class FlammableOutputConfigSchema extends SchemaBase<FlammableOutputConfi
       .concat(
         Joi.object({
           position: new LocalPositionSchema().schema,
-          transect: new TransectSchema().schema,
           radiationType: Joi.string().valid(
             ...Object.values(Enums.RadiationType)
               .filter((v) => typeof v === 'number')
@@ -1435,6 +1560,7 @@ export class FlammableOutputConfigSchema extends SchemaBase<FlammableOutputConfi
               .filter((v) => typeof v === 'number')
               .sort(),
           ),
+          transect: new TransectSchema().schema,
           fixedOrientation: Joi.number().integer(),
           orientation: Joi.number().unsafe(),
           fixedInclination: Joi.number().integer(),
@@ -1447,11 +1573,11 @@ export class FlammableOutputConfigSchema extends SchemaBase<FlammableOutputConfi
     this.propertyTypes = {
       ...this.propertyTypes,
       position: 'LocalPosition',
-      transect: 'Transect',
       radiationType: 'Enums.RadiationType',
       contourType: 'Enums.ContourType',
       radiationLevel: 'number',
       radiationResolution: 'Enums.Resolution',
+      transect: 'Transect',
       fixedOrientation: 'number',
       orientation: 'number',
       fixedInclination: 'number',
@@ -1527,13 +1653,13 @@ export interface FlashResultSchemaData extends SchemaBaseData {
   vapourEntropy: number;
   liquidEnthalpy: number;
   vapourEnthalpy: number;
+  fluidPhase: Enums.Phase;
   bubblePointPressure: number;
   bubblePointTemperature: number;
   dewPointPressure: number;
   dewPointTemperature: number;
   totalFluidDensity: number;
   liquidMassFraction: number;
-  fluidPhase: Enums.Phase;
 }
 
 /**
@@ -1558,17 +1684,17 @@ export class FlashResultSchema extends SchemaBase<FlashResultSchemaData> {
           vapourEntropy: Joi.number().unsafe(),
           liquidEnthalpy: Joi.number().unsafe(),
           vapourEnthalpy: Joi.number().unsafe(),
+          fluidPhase: Joi.string().valid(
+            ...Object.values(Enums.Phase)
+              .filter((v) => typeof v === 'number')
+              .sort(),
+          ),
           bubblePointPressure: Joi.number().unsafe(),
           bubblePointTemperature: Joi.number().unsafe(),
           dewPointPressure: Joi.number().unsafe(),
           dewPointTemperature: Joi.number().unsafe(),
           totalFluidDensity: Joi.number().unsafe(),
           liquidMassFraction: Joi.number().unsafe(),
-          fluidPhase: Joi.string().valid(
-            ...Object.values(Enums.Phase)
-              .filter((v) => typeof v === 'number')
-              .sort(),
-          ),
         }),
       )
       .pattern(ignoredPropertiesRegex, Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any()))
@@ -1585,13 +1711,13 @@ export class FlashResultSchema extends SchemaBase<FlashResultSchemaData> {
       vapourEntropy: 'number',
       liquidEnthalpy: 'number',
       vapourEnthalpy: 'number',
+      fluidPhase: 'Enums.Phase',
       bubblePointPressure: 'number',
       bubblePointTemperature: 'number',
       dewPointPressure: 'number',
       dewPointTemperature: 'number',
       totalFluidDensity: 'number',
       liquidMassFraction: 'number',
-      fluidPhase: 'Enums.Phase',
     };
   }
 
@@ -1601,9 +1727,9 @@ export class FlashResultSchema extends SchemaBase<FlashResultSchemaData> {
 }
 
 export interface LeakSchemaData extends SchemaBaseData {
-  holeDiameter: number;
   releaseAngle: number;
   timeVaryingOption: Enums.TimeVaryingOption;
+  holeDiameter: number;
   holeHeightFraction: number;
   releaseElevation: number;
 }
@@ -1621,13 +1747,13 @@ export class LeakSchema extends SchemaBase<LeakSchemaData> {
     this.schema = this.schema
       .concat(
         Joi.object({
-          holeDiameter: Joi.number().unsafe(),
           releaseAngle: Joi.number().unsafe(),
           timeVaryingOption: Joi.string().valid(
             ...Object.values(Enums.TimeVaryingOption)
               .filter((v) => typeof v === 'number')
               .sort(),
           ),
+          holeDiameter: Joi.number().unsafe(),
           holeHeightFraction: Joi.number().unsafe(),
           releaseElevation: Joi.number().unsafe(),
         }),
@@ -1637,9 +1763,9 @@ export class LeakSchema extends SchemaBase<LeakSchemaData> {
 
     this.propertyTypes = {
       ...this.propertyTypes,
-      holeDiameter: 'number',
       releaseAngle: 'number',
       timeVaryingOption: 'Enums.TimeVaryingOption',
+      holeDiameter: 'number',
       holeHeightFraction: 'number',
       releaseElevation: 'number',
     };
@@ -1651,10 +1777,10 @@ export class LeakSchema extends SchemaBase<LeakSchemaData> {
 }
 
 export interface LineRuptureSchemaData extends SchemaBaseData {
-  pipeDiameter: number;
-  pipeLength: number;
   releaseAngle: number;
   timeVaryingOption: Enums.TimeVaryingOption;
+  pipeDiameter: number;
+  pipeLength: number;
   pipeRoughness: number;
   pipeHeightFraction: number;
 }
@@ -1672,14 +1798,14 @@ export class LineRuptureSchema extends SchemaBase<LineRuptureSchemaData> {
     this.schema = this.schema
       .concat(
         Joi.object({
-          pipeDiameter: Joi.number().unsafe(),
-          pipeLength: Joi.number().unsafe(),
           releaseAngle: Joi.number().unsafe(),
           timeVaryingOption: Joi.string().valid(
             ...Object.values(Enums.TimeVaryingOption)
               .filter((v) => typeof v === 'number')
               .sort(),
           ),
+          pipeDiameter: Joi.number().unsafe(),
+          pipeLength: Joi.number().unsafe(),
           pipeRoughness: Joi.number().unsafe(),
           pipeHeightFraction: Joi.number().unsafe(),
         }),
@@ -1689,10 +1815,10 @@ export class LineRuptureSchema extends SchemaBase<LineRuptureSchemaData> {
 
     this.propertyTypes = {
       ...this.propertyTypes,
-      pipeDiameter: 'number',
-      pipeLength: 'number',
       releaseAngle: 'number',
       timeVaryingOption: 'Enums.TimeVaryingOption',
+      pipeDiameter: 'number',
+      pipeLength: 'number',
       pipeRoughness: 'number',
       pipeHeightFraction: 'number',
     };
@@ -1704,11 +1830,11 @@ export class LineRuptureSchema extends SchemaBase<LineRuptureSchemaData> {
 }
 
 export interface MaterialComponentDataItemSchemaData extends SchemaBaseData {
+  description: string;
   equationNumber: number;
+  equationString: string;
   equationCoefficients: number[];
   calculationLimits: number[];
-  description: string;
-  equationString: string;
   supercriticalExtrapolation: number;
   fractionTc: number;
 }
@@ -1726,11 +1852,11 @@ export class MaterialComponentDataItemSchema extends SchemaBase<MaterialComponen
     this.schema = this.schema
       .concat(
         Joi.object({
+          description: Joi.string().allow(''),
           equationNumber: Joi.number().integer(),
+          equationString: Joi.string().allow(''),
           equationCoefficients: Joi.array().items(Joi.number().unsafe()).allow(null),
           calculationLimits: Joi.array().items(Joi.number().unsafe()).allow(null),
-          description: Joi.string().allow(''),
-          equationString: Joi.string().allow(''),
           supercriticalExtrapolation: Joi.number().unsafe(),
           fractionTc: Joi.number().unsafe(),
         }),
@@ -1740,11 +1866,11 @@ export class MaterialComponentDataItemSchema extends SchemaBase<MaterialComponen
 
     this.propertyTypes = {
       ...this.propertyTypes,
+      description: 'string',
       equationNumber: 'number',
+      equationString: 'string',
       equationCoefficients: 'number[]',
       calculationLimits: 'number[]',
-      description: 'string',
-      equationString: 'string',
       supercriticalExtrapolation: 'number',
       fractionTc: 'number',
     };
@@ -1756,10 +1882,10 @@ export class MaterialComponentDataItemSchema extends SchemaBase<MaterialComponen
 }
 
 export interface MaterialComponentDataSchemaData extends SchemaBaseData {
+  name: string;
   dipprVersion: number;
   casId: number;
   dataItem: Entities.MaterialComponentDataItem[];
-  name: string;
 }
 
 /**
@@ -1775,10 +1901,10 @@ export class MaterialComponentDataSchema extends SchemaBase<MaterialComponentDat
     this.schema = this.schema
       .concat(
         Joi.object({
+          name: Joi.string().allow(''),
           dipprVersion: Joi.number().integer(),
           casId: Joi.number().integer(),
           dataItem: Joi.array().items(new MaterialComponentDataItemSchema().schema).allow(null),
-          name: Joi.string().allow(''),
         }),
       )
       .pattern(ignoredPropertiesRegex, Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any()))
@@ -1786,10 +1912,10 @@ export class MaterialComponentDataSchema extends SchemaBase<MaterialComponentDat
 
     this.propertyTypes = {
       ...this.propertyTypes,
+      name: 'string',
       dipprVersion: 'number',
       casId: 'number',
       dataItem: 'MaterialComponentDataItem[]',
-      name: 'string',
     };
   }
 
@@ -1803,6 +1929,7 @@ export interface MixtureConstantPropertiesResultSchemaData extends SchemaBaseDat
   upperFlammabilityLimit: number;
   criticalPressure: number;
   criticalTemperature: number;
+  flammableToxicFlag: Enums.FlammableToxic;
   flashPoint: number;
   heatCombustion: number;
   maximumBurnRate: number;
@@ -1810,11 +1937,10 @@ export interface MixtureConstantPropertiesResultSchemaData extends SchemaBaseDat
   molecularWeight: number;
   bubblePoint: number;
   poolFireBurnRateLength: number;
+  luminousSmokyFlame: Enums.LuminousSmokyFlame;
   dewPoint: number;
   emissivePowerLengthScale: number;
   laminarBurningVelocity: number;
-  flammableToxicFlag: Enums.FlammableToxic;
-  luminousSmokyFlame: Enums.LuminousSmokyFlame;
 }
 
 /**
@@ -1834,6 +1960,11 @@ export class MixtureConstantPropertiesResultSchema extends SchemaBase<MixtureCon
           upperFlammabilityLimit: Joi.number().unsafe(),
           criticalPressure: Joi.number().unsafe(),
           criticalTemperature: Joi.number().unsafe(),
+          flammableToxicFlag: Joi.string().valid(
+            ...Object.values(Enums.FlammableToxic)
+              .filter((v) => typeof v === 'number')
+              .sort(),
+          ),
           flashPoint: Joi.number().unsafe(),
           heatCombustion: Joi.number().unsafe(),
           maximumBurnRate: Joi.number().unsafe(),
@@ -1841,19 +1972,14 @@ export class MixtureConstantPropertiesResultSchema extends SchemaBase<MixtureCon
           molecularWeight: Joi.number().unsafe(),
           bubblePoint: Joi.number().unsafe(),
           poolFireBurnRateLength: Joi.number().unsafe(),
-          dewPoint: Joi.number().unsafe(),
-          emissivePowerLengthScale: Joi.number().unsafe(),
-          laminarBurningVelocity: Joi.number().unsafe(),
-          flammableToxicFlag: Joi.string().valid(
-            ...Object.values(Enums.FlammableToxic)
-              .filter((v) => typeof v === 'number')
-              .sort(),
-          ),
           luminousSmokyFlame: Joi.string().valid(
             ...Object.values(Enums.LuminousSmokyFlame)
               .filter((v) => typeof v === 'number')
               .sort(),
           ),
+          dewPoint: Joi.number().unsafe(),
+          emissivePowerLengthScale: Joi.number().unsafe(),
+          laminarBurningVelocity: Joi.number().unsafe(),
         }),
       )
       .pattern(ignoredPropertiesRegex, Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any()))
@@ -1865,6 +1991,7 @@ export class MixtureConstantPropertiesResultSchema extends SchemaBase<MixtureCon
       upperFlammabilityLimit: 'number',
       criticalPressure: 'number',
       criticalTemperature: 'number',
+      flammableToxicFlag: 'Enums.FlammableToxic',
       flashPoint: 'number',
       heatCombustion: 'number',
       maximumBurnRate: 'number',
@@ -1872,11 +1999,10 @@ export class MixtureConstantPropertiesResultSchema extends SchemaBase<MixtureCon
       molecularWeight: 'number',
       bubblePoint: 'number',
       poolFireBurnRateLength: 'number',
+      luminousSmokyFlame: 'Enums.LuminousSmokyFlame',
       dewPoint: 'number',
       emissivePowerLengthScale: 'number',
       laminarBurningVelocity: 'number',
-      flammableToxicFlag: 'Enums.FlammableToxic',
-      luminousSmokyFlame: 'Enums.LuminousSmokyFlame',
     };
   }
 
@@ -1890,9 +2016,9 @@ export interface PipeSchemaData extends SchemaBaseData {
   nodes: Entities.LocalPosition[];
   nodeCount: number;
   diameter: number;
+  roughness: number;
   material: Entities.Material;
   state: Entities.State;
-  roughness: number;
   pumpedInflow: number;
 }
 
@@ -1913,9 +2039,9 @@ export class PipeSchema extends SchemaBase<PipeSchemaData> {
           nodes: Joi.array().items(new LocalPositionSchema().schema).allow(null),
           nodeCount: Joi.number().integer(),
           diameter: Joi.number().unsafe(),
+          roughness: Joi.number().unsafe(),
           material: new MaterialSchema().schema,
           state: new StateSchema().schema,
-          roughness: Joi.number().unsafe(),
           pumpedInflow: Joi.number().unsafe(),
         }),
       )
@@ -1928,9 +2054,9 @@ export class PipeSchema extends SchemaBase<PipeSchemaData> {
       nodes: 'LocalPosition[]',
       nodeCount: 'number',
       diameter: 'number',
+      roughness: 'number',
       material: 'Material',
       state: 'State',
-      roughness: 'number',
       pumpedInflow: 'number',
     };
   }
@@ -1941,10 +2067,12 @@ export class PipeSchema extends SchemaBase<PipeSchemaData> {
 }
 
 export interface PipeBreachSchemaData extends SchemaBaseData {
-  distanceDownstream: number;
   releaseAngle: number;
   timeVaryingOption: Enums.TimeVaryingOption;
+  distanceDownstream: number;
   relativeAperture: number;
+  holeDiameter: number;
+  breachSizingMethod: Enums.BreachSizingMethod;
 }
 
 /**
@@ -1960,14 +2088,20 @@ export class PipeBreachSchema extends SchemaBase<PipeBreachSchemaData> {
     this.schema = this.schema
       .concat(
         Joi.object({
-          distanceDownstream: Joi.number().unsafe(),
           releaseAngle: Joi.number().unsafe(),
           timeVaryingOption: Joi.string().valid(
             ...Object.values(Enums.TimeVaryingOption)
               .filter((v) => typeof v === 'number')
               .sort(),
           ),
+          distanceDownstream: Joi.number().unsafe(),
           relativeAperture: Joi.number().unsafe(),
+          holeDiameter: Joi.number().unsafe(),
+          breachSizingMethod: Joi.string().valid(
+            ...Object.values(Enums.BreachSizingMethod)
+              .filter((v) => typeof v === 'number')
+              .sort(),
+          ),
         }),
       )
       .pattern(ignoredPropertiesRegex, Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any()))
@@ -1975,10 +2109,12 @@ export class PipeBreachSchema extends SchemaBase<PipeBreachSchemaData> {
 
     this.propertyTypes = {
       ...this.propertyTypes,
-      distanceDownstream: 'number',
       releaseAngle: 'number',
       timeVaryingOption: 'Enums.TimeVaryingOption',
+      distanceDownstream: 'number',
       relativeAperture: 'number',
+      holeDiameter: 'number',
+      breachSizingMethod: 'Enums.BreachSizingMethod',
     };
   }
 
@@ -1990,13 +2126,13 @@ export class PipeBreachSchema extends SchemaBase<PipeBreachSchemaData> {
 export interface PoolFireFlameResultSchemaData extends SchemaBaseData {
   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;
 }
 
 /**
@@ -2014,17 +2150,17 @@ export class PoolFireFlameResultSchema extends SchemaBase<PoolFireFlameResultSch
         Joi.object({
           time: Joi.number().unsafe(),
           surfaceEmissivePower: Joi.number().unsafe(),
-          flameLength: Joi.number().unsafe(),
-          flameDiameter: Joi.number().unsafe(),
-          poolZoneSEP: Joi.array().items(Joi.number().unsafe()).allow(null),
-          poolCentre: Joi.number().unsafe(),
           fireType: Joi.string().valid(
             ...Object.values(Enums.FireType)
               .filter((v) => typeof v === 'number')
               .sort(),
           ),
+          flameLength: Joi.number().unsafe(),
+          flameDiameter: Joi.number().unsafe(),
           liftOffHeight: Joi.number().unsafe(),
           liftOffTime: Joi.number().unsafe(),
+          poolZoneSEP: Joi.array().items(Joi.number().unsafe()).allow(null),
+          poolCentre: Joi.number().unsafe(),
         }),
       )
       .pattern(ignoredPropertiesRegex, Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any()))
@@ -2034,13 +2170,13 @@ export class PoolFireFlameResultSchema extends SchemaBase<PoolFireFlameResultSch
       ...this.propertyTypes,
       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',
     };
   }
 
@@ -2128,7 +2264,7 @@ export interface PoolVapourisationParametersSchemaData extends SchemaBaseData {
 /**
  * ================================================================================
  * Class:        PoolVapourisationParametersSchema
- * Description:  Pool vapourisation parameters
+ * Description:  Pool vapourisation parameters.
  * ================================================================================
  */
 export class PoolVapourisationParametersSchema extends SchemaBase<PoolVapourisationParametersSchemaData> {
@@ -2161,8 +2297,8 @@ export class PoolVapourisationParametersSchema extends SchemaBase<PoolVapourisat
 
 export interface RadiationRecordSchemaData extends SchemaBaseData {
   position: Entities.LocalPosition;
-  radiationResult: number;
   radiationType: Enums.RadiationType;
+  radiationResult: number;
 }
 
 /**
@@ -2179,12 +2315,12 @@ export class RadiationRecordSchema extends SchemaBase<RadiationRecordSchemaData>
       .concat(
         Joi.object({
           position: new LocalPositionSchema().schema,
-          radiationResult: Joi.number().unsafe(),
           radiationType: Joi.string().valid(
             ...Object.values(Enums.RadiationType)
               .filter((v) => typeof v === 'number')
               .sort(),
           ),
+          radiationResult: Joi.number().unsafe(),
         }),
       )
       .pattern(ignoredPropertiesRegex, Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any()))
@@ -2193,8 +2329,8 @@ export class RadiationRecordSchema extends SchemaBase<RadiationRecordSchemaData>
     this.propertyTypes = {
       ...this.propertyTypes,
       position: 'LocalPosition',
-      radiationResult: 'number',
       radiationType: 'Enums.RadiationType',
+      radiationResult: 'number',
     };
   }
 
@@ -2204,11 +2340,11 @@ export class RadiationRecordSchema extends SchemaBase<RadiationRecordSchemaData>
 }
 
 export interface ReliefValveSchemaData extends SchemaBaseData {
+  releaseAngle: number;
+  timeVaryingOption: Enums.TimeVaryingOption;
   reliefValveConstrictionDiameter: number;
   pipeDiameter: number;
   pipeLength: number;
-  releaseAngle: number;
-  timeVaryingOption: Enums.TimeVaryingOption;
   pipeRoughness: number;
   pipeHeightFraction: number;
 }
@@ -2226,15 +2362,15 @@ export class ReliefValveSchema extends SchemaBase<ReliefValveSchemaData> {
     this.schema = this.schema
       .concat(
         Joi.object({
-          reliefValveConstrictionDiameter: Joi.number().unsafe(),
-          pipeDiameter: Joi.number().unsafe(),
-          pipeLength: Joi.number().unsafe(),
           releaseAngle: Joi.number().unsafe(),
           timeVaryingOption: Joi.string().valid(
             ...Object.values(Enums.TimeVaryingOption)
               .filter((v) => typeof v === 'number')
               .sort(),
           ),
+          reliefValveConstrictionDiameter: Joi.number().unsafe(),
+          pipeDiameter: Joi.number().unsafe(),
+          pipeLength: Joi.number().unsafe(),
           pipeRoughness: Joi.number().unsafe(),
           pipeHeightFraction: Joi.number().unsafe(),
         }),
@@ -2244,11 +2380,11 @@ export class ReliefValveSchema extends SchemaBase<ReliefValveSchemaData> {
 
     this.propertyTypes = {
       ...this.propertyTypes,
+      releaseAngle: 'number',
+      timeVaryingOption: 'Enums.TimeVaryingOption',
       reliefValveConstrictionDiameter: 'number',
       pipeDiameter: 'number',
       pipeLength: 'number',
-      releaseAngle: 'number',
-      timeVaryingOption: 'Enums.TimeVaryingOption',
       pipeRoughness: 'number',
       pipeHeightFraction: 'number',
     };
@@ -2311,11 +2447,11 @@ export class SafetySystemSchema extends SchemaBase<SafetySystemSchemaData> {
 export interface ScalarUdmOutputsSchemaData extends SchemaBaseData {
   observerCount: number;
   recordCount: number;
+  cloudType: Enums.DynamicType;
   minimumConcentration: number;
   windPower: number;
   frictionVelocity: number;
   dispersionReleaseDuration: number;
-  cloudType: Enums.DynamicType;
 }
 
 /**
@@ -2333,15 +2469,15 @@ export class ScalarUdmOutputsSchema extends SchemaBase<ScalarUdmOutputsSchemaDat
         Joi.object({
           observerCount: Joi.number().integer(),
           recordCount: Joi.number().integer(),
-          minimumConcentration: Joi.number().unsafe(),
-          windPower: Joi.number().unsafe(),
-          frictionVelocity: Joi.number().unsafe(),
-          dispersionReleaseDuration: Joi.number().unsafe(),
           cloudType: Joi.string().valid(
             ...Object.values(Enums.DynamicType)
               .filter((v) => typeof v === 'number')
               .sort(),
           ),
+          minimumConcentration: Joi.number().unsafe(),
+          windPower: Joi.number().unsafe(),
+          frictionVelocity: Joi.number().unsafe(),
+          dispersionReleaseDuration: Joi.number().unsafe(),
         }),
       )
       .pattern(ignoredPropertiesRegex, Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any()))
@@ -2351,11 +2487,11 @@ export class ScalarUdmOutputsSchema extends SchemaBase<ScalarUdmOutputsSchemaDat
       ...this.propertyTypes,
       observerCount: 'number',
       recordCount: 'number',
+      cloudType: 'Enums.DynamicType',
       minimumConcentration: 'number',
       windPower: 'number',
       frictionVelocity: 'number',
       dispersionReleaseDuration: 'number',
-      cloudType: 'Enums.DynamicType',
     };
   }
 
@@ -2365,10 +2501,10 @@ export class ScalarUdmOutputsSchema extends SchemaBase<ScalarUdmOutputsSchemaDat
 }
 
 export interface ShortPipeRuptureSchemaData extends SchemaBaseData {
-  pipeLength: number;
-  pipeDiameter: number;
   releaseAngle: number;
   timeVaryingOption: Enums.TimeVaryingOption;
+  pipeLength: number;
+  pipeDiameter: number;
   pipeRoughness: number;
   pipeHeightFraction: number;
 }
@@ -2376,7 +2512,7 @@ export interface ShortPipeRuptureSchemaData extends SchemaBaseData {
 /**
  * ================================================================================
  * Class:        ShortPipeRuptureSchema
- * Description:  Short pipe rupture scenario
+ * Description:  Short pipe rupture scenario.
  * ================================================================================
  */
 export class ShortPipeRuptureSchema extends SchemaBase<ShortPipeRuptureSchemaData> {
@@ -2386,14 +2522,14 @@ export class ShortPipeRuptureSchema extends SchemaBase<ShortPipeRuptureSchemaDat
     this.schema = this.schema
       .concat(
         Joi.object({
-          pipeLength: Joi.number().unsafe(),
-          pipeDiameter: Joi.number().unsafe(),
           releaseAngle: Joi.number().unsafe(),
           timeVaryingOption: Joi.string().valid(
             ...Object.values(Enums.TimeVaryingOption)
               .filter((v) => typeof v === 'number')
               .sort(),
           ),
+          pipeLength: Joi.number().unsafe(),
+          pipeDiameter: Joi.number().unsafe(),
           pipeRoughness: Joi.number().unsafe(),
           pipeHeightFraction: Joi.number().unsafe(),
         }),
@@ -2403,10 +2539,10 @@ export class ShortPipeRuptureSchema extends SchemaBase<ShortPipeRuptureSchemaDat
 
     this.propertyTypes = {
       ...this.propertyTypes,
-      pipeLength: 'number',
-      pipeDiameter: 'number',
       releaseAngle: 'number',
       timeVaryingOption: 'Enums.TimeVaryingOption',
+      pipeLength: 'number',
+      pipeDiameter: 'number',
       pipeRoughness: 'number',
       pipeHeightFraction: 'number',
     };
@@ -2455,10 +2591,10 @@ export class StructureSchema extends SchemaBase<StructureSchemaData> {
 }
 
 export interface SubstrateSchemaData extends SchemaBaseData {
-  bund: Entities.Bund;
   surfaceRoughness: number;
   surfaceType: Enums.SurfaceType;
   poolSurfaceType: Enums.PoolSurfaceType;
+  bund: Entities.Bund;
 }
 
 /**
@@ -2474,7 +2610,6 @@ export class SubstrateSchema extends SchemaBase<SubstrateSchemaData> {
     this.schema = this.schema
       .concat(
         Joi.object({
-          bund: new BundSchema().schema,
           surfaceRoughness: Joi.number().unsafe(),
           surfaceType: Joi.string().valid(
             ...Object.values(Enums.SurfaceType)
@@ -2486,6 +2621,7 @@ export class SubstrateSchema extends SchemaBase<SubstrateSchemaData> {
               .filter((v) => typeof v === 'number')
               .sort(),
           ),
+          bund: new BundSchema().schema,
         }),
       )
       .pattern(ignoredPropertiesRegex, Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any()))
@@ -2493,10 +2629,10 @@ export class SubstrateSchema extends SchemaBase<SubstrateSchemaData> {
 
     this.propertyTypes = {
       ...this.propertyTypes,
-      bund: 'Bund',
       surfaceRoughness: 'number',
       surfaceType: 'Enums.SurfaceType',
       poolSurfaceType: 'Enums.PoolSurfaceType',
+      bund: 'Bund',
     };
   }
 
@@ -2507,8 +2643,8 @@ export class SubstrateSchema extends SchemaBase<SubstrateSchemaData> {
 
 export interface ToxicRecordSchemaData extends SchemaBaseData {
   position: Entities.LocalPosition;
-  toxicResult: number;
   toxicResultType: Enums.ToxicResultType;
+  toxicResult: number;
 }
 
 /**
@@ -2525,12 +2661,12 @@ export class ToxicRecordSchema extends SchemaBase<ToxicRecordSchemaData> {
       .concat(
         Joi.object({
           position: new LocalPositionSchema().schema,
-          toxicResult: Joi.number().unsafe(),
           toxicResultType: Joi.string().valid(
             ...Object.values(Enums.ToxicResultType)
               .filter((v) => typeof v === 'number')
               .sort(),
           ),
+          toxicResult: Joi.number().unsafe(),
         }),
       )
       .pattern(ignoredPropertiesRegex, Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any()))
@@ -2539,8 +2675,8 @@ export class ToxicRecordSchema extends SchemaBase<ToxicRecordSchemaData> {
     this.propertyTypes = {
       ...this.propertyTypes,
       position: 'LocalPosition',
-      toxicResult: 'number',
       toxicResultType: 'Enums.ToxicResultType',
+      toxicResult: 'number',
     };
   }
 
@@ -2552,15 +2688,15 @@ export class ToxicRecordSchema extends SchemaBase<ToxicRecordSchemaData> {
 export interface VesselSchemaData extends SchemaBaseData {
   location: Entities.LocalPosition;
   state: Entities.State;
-  material: Entities.Material;
-  safetySystem: Entities.SafetySystem;
   diameter: number;
   height: number;
   length: number;
   width: number;
   shape: Enums.VesselShape;
+  material: Entities.Material;
   vesselConditions: Enums.VesselConditions;
   liquidFillFractionByVolume: number;
+  safetySystem: Entities.SafetySystem;
 }
 
 /**
@@ -2578,8 +2714,6 @@ export class VesselSchema extends SchemaBase<VesselSchemaData> {
         Joi.object({
           location: new LocalPositionSchema().schema,
           state: new StateSchema().schema,
-          material: new MaterialSchema().schema,
-          safetySystem: new SafetySystemSchema().schema,
           diameter: Joi.number().unsafe(),
           height: Joi.number().unsafe(),
           length: Joi.number().unsafe(),
@@ -2589,12 +2723,14 @@ export class VesselSchema extends SchemaBase<VesselSchemaData> {
               .filter((v) => typeof v === 'number')
               .sort(),
           ),
+          material: new MaterialSchema().schema,
           vesselConditions: Joi.string().valid(
             ...Object.values(Enums.VesselConditions)
               .filter((v) => typeof v === 'number')
               .sort(),
           ),
           liquidFillFractionByVolume: Joi.number().unsafe(),
+          safetySystem: new SafetySystemSchema().schema,
         }),
       )
       .pattern(ignoredPropertiesRegex, Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any()))
@@ -2604,15 +2740,15 @@ export class VesselSchema extends SchemaBase<VesselSchemaData> {
       ...this.propertyTypes,
       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',
     };
   }
 
@@ -2624,10 +2760,10 @@ export class VesselSchema extends SchemaBase<VesselSchemaData> {
 export interface VesselLeakMaxFlammableCloudResultsSchemaData extends SchemaBaseData {
   dischargeRate: number;
   expandedTemperature: number;
+  phase: Enums.Phase;
   lflExtent: number;
   lflArea: number;
   lflHeight: number;
-  phase: Enums.Phase;
 }
 
 /**
@@ -2645,14 +2781,14 @@ export class VesselLeakMaxFlammableCloudResultsSchema extends SchemaBase<VesselL
         Joi.object({
           dischargeRate: Joi.number().unsafe(),
           expandedTemperature: Joi.number().unsafe(),
-          lflExtent: Joi.number().unsafe(),
-          lflArea: Joi.number().unsafe(),
-          lflHeight: Joi.number().unsafe(),
           phase: Joi.string().valid(
             ...Object.values(Enums.Phase)
               .filter((v) => typeof v === 'number')
               .sort(),
           ),
+          lflExtent: Joi.number().unsafe(),
+          lflArea: Joi.number().unsafe(),
+          lflHeight: Joi.number().unsafe(),
         }),
       )
       .pattern(ignoredPropertiesRegex, Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any()))
@@ -2662,10 +2798,10 @@ export class VesselLeakMaxFlammableCloudResultsSchema extends SchemaBase<VesselL
       ...this.propertyTypes,
       dischargeRate: 'number',
       expandedTemperature: 'number',
+      phase: 'Enums.Phase',
       lflExtent: 'number',
       lflArea: 'number',
       lflHeight: 'number',
-      phase: 'Enums.Phase',
     };
   }