@dnv-plant/typescriptpws 1.0.18 → 1.0.22-alpha.1807518

package/src/entity-schemas.ts

@@ -1,7 +1,7 @@
 /***********************************************************************
  * This file has been auto-generated by a code generation tool.
- * Version:   1.0.18
- * Date/time: 18 Feb 2025 14:37:50
+ * Version:   1.0.22
+ * Date/time: 19 Feb 2025 15:30:41
  * Template:  templates/typescriptpws/entityschemas.razor.
  ***********************************************************************/
 
@@ -33,7 +33,49 @@ const propertiesToIgnore = [
 // Convert array to regex pattern
 const ignoredPropertiesRegex = new RegExp(`^(${propertiesToIgnore.join("|")})$`);
 
-export interface LocalPositionSchemaData {
+class ValidationError extends Error {
+  constructor(public details: string[]) {
+    super(`Validation error: ${details.join(", ")}`);
+    this.name = "ValidationError";
+  }
+}
+
+abstract class SchemaBase<T> {
+  schema: Joi.ObjectSchema;
+  propertyTypes: Record<string, string>;
+
+  constructor() {
+    this.schema = Joi.object({
+      id: Joi.string().allow(""),
+      typeId: Joi.string().allow(""),
+      displayName: Joi.string().allow(""),
+    });
+  
+    this.propertyTypes = {
+      id: "string",
+      typeId: "string",
+      displayName: "string",
+    };
+  }
+
+  validate(data: T): T {
+    const { error } = this.schema.validate(data, { abortEarly: false });
+    if (error) {
+      throw new ValidationError(error.details.map((x) => x.message));
+    }
+    return this.makeEntity(data);
+  }
+
+  abstract makeEntity(data: T): any;
+}
+
+interface SchemaBaseData {
+  id: string;
+  typeId: string;
+  displayName: string;
+}
+
+export interface LocalPositionSchemaData extends SchemaBaseData {
   x: number;
   y: number;
   z: number;
@@ -45,39 +87,35 @@ export interface LocalPositionSchemaData {
  * Description:  Position with reference to some arbitrary local origin and axes.
  * ================================================================================
  */
-export class LocalPositionSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class LocalPositionSchema extends SchemaBase<LocalPositionSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      x: Joi.number().unsafe(),
-      y: Joi.number().unsafe(),
-      z: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        x: Joi.number().unsafe(),
+        y: Joi.number().unsafe(),
+        z: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       x: "number",
       y: "number",
       z: "number",
     };
   }
 
-  validate(data: LocalPositionSchemaData): Entities.LocalPosition {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: LocalPositionSchemaData): Entities.LocalPosition {
     return new Entities.LocalPosition(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.x,
       data.y,
       data.z
@@ -85,7 +123,7 @@ export class LocalPositionSchema {
   }
 }
 
-export interface AssetSchemaData {
+export interface AssetSchemaData extends SchemaBaseData {
   location: Entities.LocalPosition;
 }
 
@@ -95,41 +133,37 @@ export interface AssetSchemaData {
  * Description:  Any equipment to be modeled, vessels, pipelines
  * ================================================================================
  */
-export class AssetSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class AssetSchema extends SchemaBase<AssetSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      location: new LocalPositionSchema().schema,
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        location: new LocalPositionSchema().schema,
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       location: "LocalPosition",
     };
   }
 
-  validate(data: AssetSchemaData): Entities.Asset {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: AssetSchemaData): Entities.Asset {
     return new Entities.Asset(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.location
     );
   }
 }
 
-export interface MaterialComponentSchemaData {
+export interface MaterialComponentSchemaData extends SchemaBaseData {
   name: string;
   moleFraction: number;
 }
@@ -140,44 +174,40 @@ export interface MaterialComponentSchemaData {
  * Description:  Constituent component of a material.
  * ================================================================================
  */
-export class MaterialComponentSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class MaterialComponentSchema extends SchemaBase<MaterialComponentSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      name: Joi.string().allow(""),
-      moleFraction: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        name: Joi.string().allow(""),
+        moleFraction: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       name: "string",
       moleFraction: "number",
     };
   }
 
-  validate(data: MaterialComponentSchemaData): Entities.MaterialComponent {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: MaterialComponentSchemaData): Entities.MaterialComponent {
     return new Entities.MaterialComponent(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.name,
       data.moleFraction
     );
   }
 }
 
-export interface MaterialSchemaData {
+export interface MaterialSchemaData extends SchemaBaseData {
   name: string;
   components: Entities.MaterialComponent[];
   componentCount: number;
@@ -190,24 +220,25 @@ export interface MaterialSchemaData {
  * Description:  The material to use in calculations.
  * ================================================================================
  */
-export class MaterialSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class MaterialSchema extends SchemaBase<MaterialSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      name: Joi.string().allow(""),
-      components: Joi.array().items(new MaterialComponentSchema().schema).allow(null),
-      componentCount: Joi.number().integer(),
-      propertyTemplate: Joi.string().valid(...Object.values(Enums.PropertyTemplate)),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        name: Joi.string().allow(""),
+        components: Joi.array().items(new MaterialComponentSchema().schema).allow(null),
+        componentCount: Joi.number().integer(),
+        propertyTemplate: Joi.string().valid(...Object.values(Enums.PropertyTemplate)),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       name: "string",
       components: "MaterialComponent[]",
       componentCount: "number",
@@ -215,16 +246,11 @@ export class MaterialSchema {
     };
   }
 
-  validate(data: MaterialSchemaData): Entities.Material {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: MaterialSchemaData): Entities.Material {
     return new Entities.Material(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.name,
       data.components,
       data.componentCount,
@@ -233,7 +259,7 @@ export class MaterialSchema {
   }
 }
 
-export interface StateSchemaData {
+export interface StateSchemaData extends SchemaBaseData {
   pressure: number;
   temperature: number;
   liquidFraction: number;
@@ -247,25 +273,26 @@ export interface StateSchemaData {
  * Description:  Description of the fluid state.
  * ================================================================================
  */
-export class StateSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class StateSchema extends SchemaBase<StateSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      pressure: Joi.number().unsafe(),
-      temperature: Joi.number().unsafe(),
-      liquidFraction: Joi.number().unsafe(),
-      flashFlag: Joi.string().valid(...Object.values(Enums.FluidSpec)),
-      mixtureModelling: Joi.string().valid(...Object.values(Enums.MixtureModelling)),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        pressure: Joi.number().unsafe(),
+        temperature: Joi.number().unsafe(),
+        liquidFraction: Joi.number().unsafe(),
+        flashFlag: Joi.string().valid(...Object.values(Enums.FluidSpec)),
+        mixtureModelling: Joi.string().valid(...Object.values(Enums.MixtureModelling)),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       pressure: "number",
       temperature: "number",
       liquidFraction: "number",
@@ -274,16 +301,11 @@ export class StateSchema {
     };
   }
 
-  validate(data: StateSchemaData): Entities.State {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: StateSchemaData): Entities.State {
     return new Entities.State(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.pressure,
       data.temperature,
       data.liquidFraction,
@@ -293,7 +315,7 @@ export class StateSchema {
   }
 }
 
-export interface AtmosphericStorageTankSchemaData {
+export interface AtmosphericStorageTankSchemaData extends SchemaBaseData {
   location: Entities.LocalPosition;
   state: Entities.State;
   diameter: number;
@@ -308,26 +330,27 @@ export interface AtmosphericStorageTankSchemaData {
  * Description:  An atmospheric storage tank asset to model events that involve releases from unpressurised containment.
  * ================================================================================
  */
-export class AtmosphericStorageTankSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class AtmosphericStorageTankSchema extends SchemaBase<AtmosphericStorageTankSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      location: new LocalPositionSchema().schema,
-      state: new StateSchema().schema,
-      diameter: Joi.number().unsafe(),
-      height: Joi.number().unsafe(),
-      material: new MaterialSchema().schema,
-      liquidFillFractionByVolume: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        location: new LocalPositionSchema().schema,
+        state: new StateSchema().schema,
+        diameter: Joi.number().unsafe(),
+        height: Joi.number().unsafe(),
+        material: new MaterialSchema().schema,
+        liquidFillFractionByVolume: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       location: "LocalPosition",
       state: "State",
       diameter: "number",
@@ -337,16 +360,11 @@ export class AtmosphericStorageTankSchema {
     };
   }
 
-  validate(data: AtmosphericStorageTankSchemaData): Entities.AtmosphericStorageTank {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: AtmosphericStorageTankSchemaData): Entities.AtmosphericStorageTank {
     return new Entities.AtmosphericStorageTank(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.location,
       data.state,
       data.diameter,
@@ -357,7 +375,7 @@ export class AtmosphericStorageTankSchema {
   }
 }
 
-export interface BundSchemaData {
+export interface BundSchemaData extends SchemaBaseData {
   bundHeight: number;
   bundDiameter: number;
   specifyBund: boolean;
@@ -369,39 +387,35 @@ export interface BundSchemaData {
  * Description:  A bund entity used in the modelling of pool spreading and vaporisation.
  * ================================================================================
  */
-export class BundSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class BundSchema extends SchemaBase<BundSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      bundHeight: Joi.number().unsafe(),
-      bundDiameter: Joi.number().unsafe(),
-      specifyBund: Joi.boolean(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        bundHeight: Joi.number().unsafe(),
+        bundDiameter: Joi.number().unsafe(),
+        specifyBund: Joi.boolean(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       bundHeight: "number",
       bundDiameter: "number",
       specifyBund: "boolean",
     };
   }
 
-  validate(data: BundSchemaData): Entities.Bund {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: BundSchemaData): Entities.Bund {
     return new Entities.Bund(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.bundHeight,
       data.bundDiameter,
       data.specifyBund
@@ -409,7 +423,7 @@ export class BundSchema {
   }
 }
 
-export interface ScenarioSchemaData {}
+export interface ScenarioSchemaData extends SchemaBaseData {}
 
 /**
  * ================================================================================
@@ -417,35 +431,31 @@ export interface ScenarioSchemaData {}
  * Description:  Base struct/class for all scenario types.
  * ================================================================================
  */
-export class ScenarioSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class ScenarioSchema extends SchemaBase<ScenarioSchemaData> {
   constructor() {
-    this.schema = Joi.object()
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object()
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
-    this.propertyTypes = {};
-  }
-
-  validate(data: ScenarioSchemaData): Entities.Scenario {
-    const { error } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity();
+    this.propertyTypes = {
+      ...this.propertyTypes,};
   }
 
-  makeEntity(): Entities.Scenario {
-    return new Entities.Scenario();
+  makeEntity(data: ScenarioSchemaData): Entities.Scenario {
+    return new Entities.Scenario(
+      data.id,
+      data.typeId,
+      data.displayName,);
   }
 }
 
-export interface InstantaneousSchemaData {}
+export interface InstantaneousSchemaData extends SchemaBaseData {}
 
 /**
  * ================================================================================
@@ -453,35 +463,31 @@ export interface InstantaneousSchemaData {}
  * Description:  Base struct/class for instantaneous release scenarios.
  * ================================================================================
  */
-export class InstantaneousSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class InstantaneousSchema extends SchemaBase<InstantaneousSchemaData> {
   constructor() {
-    this.schema = Joi.object()
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
-
-    this.propertyTypes = {};
-  }
+    super();
+    this.schema = this.schema.concat(
+      Joi.object()
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
-  validate(data: InstantaneousSchemaData): Entities.Instantaneous {
-    const { error } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity();
+    this.propertyTypes = {
+      ...this.propertyTypes,};
   }
 
-  makeEntity(): Entities.Instantaneous {
-    return new Entities.Instantaneous();
+  makeEntity(data: InstantaneousSchemaData): Entities.Instantaneous {
+    return new Entities.Instantaneous(
+      data.id,
+      data.typeId,
+      data.displayName,);
   }
 }
 
-export interface CatastrophicRuptureSchemaData {}
+export interface CatastrophicRuptureSchemaData extends SchemaBaseData {}
 
 /**
  * ================================================================================
@@ -489,35 +495,31 @@ export interface CatastrophicRuptureSchemaData {}
  * Description:  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.
  * ================================================================================
  */
-export class CatastrophicRuptureSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class CatastrophicRuptureSchema extends SchemaBase<CatastrophicRuptureSchemaData> {
   constructor() {
-    this.schema = Joi.object()
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
-
-    this.propertyTypes = {};
-  }
+    super();
+    this.schema = this.schema.concat(
+      Joi.object()
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
-  validate(data: CatastrophicRuptureSchemaData): Entities.CatastrophicRupture {
-    const { error } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity();
+    this.propertyTypes = {
+      ...this.propertyTypes,};
   }
 
-  makeEntity(): Entities.CatastrophicRupture {
-    return new Entities.CatastrophicRupture();
+  makeEntity(data: CatastrophicRuptureSchemaData): Entities.CatastrophicRupture {
+    return new Entities.CatastrophicRupture(
+      data.id,
+      data.typeId,
+      data.displayName,);
   }
 }
 
-export interface ConcentrationRecordSchemaData {
+export interface ConcentrationRecordSchemaData extends SchemaBaseData {
   concentration: number;
   position: Entities.LocalPosition;
 }
@@ -528,44 +530,40 @@ export interface ConcentrationRecordSchemaData {
  * Description:  A record containing the cloud concentration at a specified x, y, z position.
  * ================================================================================
  */
-export class ConcentrationRecordSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class ConcentrationRecordSchema extends SchemaBase<ConcentrationRecordSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      concentration: Joi.number().unsafe(),
-      position: new LocalPositionSchema().schema,
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        concentration: Joi.number().unsafe(),
+        position: new LocalPositionSchema().schema,
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       concentration: "number",
       position: "LocalPosition",
     };
   }
 
-  validate(data: ConcentrationRecordSchemaData): Entities.ConcentrationRecord {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: ConcentrationRecordSchemaData): Entities.ConcentrationRecord {
     return new Entities.ConcentrationRecord(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.concentration,
       data.position
     );
   }
 }
 
-export interface ConstantMaterialResultSchemaData {
+export interface ConstantMaterialResultSchemaData extends SchemaBaseData {
   criticalPressure: number;
   criticalTemperature: number;
   totalMolecularWeight: number;
@@ -577,39 +575,35 @@ export interface ConstantMaterialResultSchemaData {
  * Description:  Constant material properties, i.e. critical pressure, temperature, molecular weight
  * ================================================================================
  */
-export class ConstantMaterialResultSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class ConstantMaterialResultSchema extends SchemaBase<ConstantMaterialResultSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      criticalPressure: Joi.number().unsafe(),
-      criticalTemperature: Joi.number().unsafe(),
-      totalMolecularWeight: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        criticalPressure: Joi.number().unsafe(),
+        criticalTemperature: Joi.number().unsafe(),
+        totalMolecularWeight: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       criticalPressure: "number",
       criticalTemperature: "number",
       totalMolecularWeight: "number",
     };
   }
 
-  validate(data: ConstantMaterialResultSchemaData): Entities.ConstantMaterialResult {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: ConstantMaterialResultSchemaData): Entities.ConstantMaterialResult {
     return new Entities.ConstantMaterialResult(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.criticalPressure,
       data.criticalTemperature,
       data.totalMolecularWeight
@@ -617,7 +611,7 @@ export class ConstantMaterialResultSchema {
   }
 }
 
-export interface DischargeParametersSchemaData {
+export interface DischargeParametersSchemaData extends SchemaBaseData {
   flashAtOrifice: Enums.FlashAtOrifice;
 }
 
@@ -627,41 +621,37 @@ export interface DischargeParametersSchemaData {
  * Description:  A set of parameters used in discharge calculations.
  * ================================================================================
  */
-export class DischargeParametersSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class DischargeParametersSchema extends SchemaBase<DischargeParametersSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      flashAtOrifice: Joi.string().valid(...Object.values(Enums.FlashAtOrifice)),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        flashAtOrifice: Joi.string().valid(...Object.values(Enums.FlashAtOrifice)),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       flashAtOrifice: "Enums.FlashAtOrifice",
     };
   }
 
-  validate(data: DischargeParametersSchemaData): Entities.DischargeParameters {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: DischargeParametersSchemaData): Entities.DischargeParameters {
     return new Entities.DischargeParameters(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.flashAtOrifice
     );
   }
 }
 
-export interface DischargeRecordSchemaData {
+export interface DischargeRecordSchemaData extends SchemaBaseData {
   time: number;
   massFlow: number;
   finalState: Entities.State;
@@ -679,29 +669,30 @@ export interface DischargeRecordSchemaData {
  * Description:  A record containing discharge results at a given time.
  * ================================================================================
  */
-export class DischargeRecordSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class DischargeRecordSchema extends SchemaBase<DischargeRecordSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      time: Joi.number().unsafe(),
-      massFlow: Joi.number().unsafe(),
-      finalState: new StateSchema().schema,
-      finalVelocity: Joi.number().unsafe(),
-      orificeState: new StateSchema().schema,
-      orificeVelocity: Joi.number().unsafe(),
-      storageState: new StateSchema().schema,
-      dropletDiameter: Joi.number().unsafe(),
-      expandedDiameter: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        time: Joi.number().unsafe(),
+        massFlow: Joi.number().unsafe(),
+        finalState: new StateSchema().schema,
+        finalVelocity: Joi.number().unsafe(),
+        orificeState: new StateSchema().schema,
+        orificeVelocity: Joi.number().unsafe(),
+        storageState: new StateSchema().schema,
+        dropletDiameter: Joi.number().unsafe(),
+        expandedDiameter: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       time: "number",
       massFlow: "number",
       finalState: "State",
@@ -714,16 +705,11 @@ export class DischargeRecordSchema {
     };
   }
 
-  validate(data: DischargeRecordSchemaData): Entities.DischargeRecord {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: DischargeRecordSchemaData): Entities.DischargeRecord {
     return new Entities.DischargeRecord(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.time,
       data.massFlow,
       data.finalState,
@@ -737,7 +723,7 @@ export class DischargeRecordSchema {
   }
 }
 
-export interface DischargeResultSchemaData {
+export interface DischargeResultSchemaData extends SchemaBaseData {
   expansionEnergy: number;
   releaseMass: number;
   height: number;
@@ -753,27 +739,28 @@ export interface DischargeResultSchemaData {
  * Description:  A set of discharge results that do not vary with time.
  * ================================================================================
  */
-export class DischargeResultSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class DischargeResultSchema extends SchemaBase<DischargeResultSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      expansionEnergy: Joi.number().unsafe(),
-      releaseMass: Joi.number().unsafe(),
-      height: Joi.number().unsafe(),
-      angle: Joi.number().unsafe(),
-      holeDiameter: Joi.number().unsafe(),
-      releaseType: Joi.string().valid(...Object.values(Enums.DynamicType)),
-      preDilutionAirRate: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        expansionEnergy: Joi.number().unsafe(),
+        releaseMass: Joi.number().unsafe(),
+        height: Joi.number().unsafe(),
+        angle: Joi.number().unsafe(),
+        holeDiameter: Joi.number().unsafe(),
+        releaseType: Joi.string().valid(...Object.values(Enums.DynamicType)),
+        preDilutionAirRate: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       expansionEnergy: "number",
       releaseMass: "number",
       height: "number",
@@ -784,16 +771,11 @@ export class DischargeResultSchema {
     };
   }
 
-  validate(data: DischargeResultSchemaData): Entities.DischargeResult {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: DischargeResultSchemaData): Entities.DischargeResult {
     return new Entities.DischargeResult(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.expansionEnergy,
       data.releaseMass,
       data.height,
@@ -805,7 +787,7 @@ export class DischargeResultSchema {
   }
 }
 
-export interface DispersionOutputConfigSchemaData {
+export interface DispersionOutputConfigSchemaData extends SchemaBaseData {
   downwindDistance: number;
   time: number;
   resolution: Enums.Resolution;
@@ -825,31 +807,32 @@ export interface DispersionOutputConfigSchemaData {
  * Description:  Dispersion plotting and reporting parameters.
  * ================================================================================
  */
-export class DispersionOutputConfigSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class DispersionOutputConfigSchema extends SchemaBase<DispersionOutputConfigSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      downwindDistance: Joi.number().unsafe(),
-      time: Joi.number().unsafe(),
-      resolution: Joi.string().valid(...Object.values(Enums.Resolution)),
-      elevation: Joi.number().unsafe(),
-      specialConcentration: Joi.string().valid(...Object.values(Enums.SpecialConcentration)),
-      concentration: Joi.number().unsafe(),
-      crosswindDistance: Joi.number().unsafe(),
-      contourType: Joi.string().valid(...Object.values(Enums.ContourType)),
-      lflFractionValue: Joi.number().unsafe(),
-      componentToTrackIndex: Joi.number().integer(),
-      componentToTrackName: Joi.string().allow(""),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        downwindDistance: Joi.number().unsafe(),
+        time: Joi.number().unsafe(),
+        resolution: Joi.string().valid(...Object.values(Enums.Resolution)),
+        elevation: Joi.number().unsafe(),
+        specialConcentration: Joi.string().valid(...Object.values(Enums.SpecialConcentration)),
+        concentration: Joi.number().unsafe(),
+        crosswindDistance: Joi.number().unsafe(),
+        contourType: Joi.string().valid(...Object.values(Enums.ContourType)),
+        lflFractionValue: Joi.number().unsafe(),
+        componentToTrackIndex: Joi.number().integer(),
+        componentToTrackName: Joi.string().allow(""),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       downwindDistance: "number",
       time: "number",
       resolution: "Enums.Resolution",
@@ -864,16 +847,11 @@ export class DispersionOutputConfigSchema {
     };
   }
 
-  validate(data: DispersionOutputConfigSchemaData): Entities.DispersionOutputConfig {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: DispersionOutputConfigSchemaData): Entities.DispersionOutputConfig {
     return new Entities.DispersionOutputConfig(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.downwindDistance,
       data.time,
       data.resolution,
@@ -889,7 +867,7 @@ export class DispersionOutputConfigSchema {
   }
 }
 
-export interface DispersionParametersSchemaData {
+export interface DispersionParametersSchemaData extends SchemaBaseData {
   relativeTolerance: number;
   rainoutThermoFlag: Enums.RainoutThermoFlag;
   fixedStepSize: number;
@@ -908,30 +886,31 @@ export interface DispersionParametersSchemaData {
  * Description:  A set of parameters used in dispersion calculations.
  * ================================================================================
  */
-export class DispersionParametersSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class DispersionParametersSchema extends SchemaBase<DispersionParametersSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      relativeTolerance: Joi.number().unsafe(),
-      rainoutThermoFlag: Joi.string().valid(...Object.values(Enums.RainoutThermoFlag)),
-      fixedStepSize: Joi.number().unsafe(),
-      outputStepMultiplier: Joi.number().unsafe(),
-      maxDispersionDistance: Joi.number().unsafe(),
-      maxDispersionHeight: Joi.number().unsafe(),
-      numberOfReleaseObservers: Joi.number().integer(),
-      numberOfPoolObservers: Joi.number().integer(),
-      averagingTime: Joi.number().unsafe(),
-      lflFractionToStop: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        relativeTolerance: Joi.number().unsafe(),
+        rainoutThermoFlag: Joi.string().valid(...Object.values(Enums.RainoutThermoFlag)),
+        fixedStepSize: Joi.number().unsafe(),
+        outputStepMultiplier: Joi.number().unsafe(),
+        maxDispersionDistance: Joi.number().unsafe(),
+        maxDispersionHeight: Joi.number().unsafe(),
+        numberOfReleaseObservers: Joi.number().integer(),
+        numberOfPoolObservers: Joi.number().integer(),
+        averagingTime: Joi.number().unsafe(),
+        lflFractionToStop: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       relativeTolerance: "number",
       rainoutThermoFlag: "Enums.RainoutThermoFlag",
       fixedStepSize: "number",
@@ -945,16 +924,11 @@ export class DispersionParametersSchema {
     };
   }
 
-  validate(data: DispersionParametersSchemaData): Entities.DispersionParameters {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: DispersionParametersSchemaData): Entities.DispersionParameters {
     return new Entities.DispersionParameters(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.relativeTolerance,
       data.rainoutThermoFlag,
       data.fixedStepSize,
@@ -969,7 +943,7 @@ export class DispersionParametersSchema {
   }
 }
 
-export interface DispersionRecordSchemaData {
+export interface DispersionRecordSchemaData extends SchemaBaseData {
   observerIndex: number;
   centrelineConcentration: number;
   downwindDistance: number;
@@ -1007,49 +981,50 @@ export interface DispersionRecordSchemaData {
  * Description:  A record containing observer dispersion results at a given time.
  * ================================================================================
  */
-export class DispersionRecordSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class DispersionRecordSchema extends SchemaBase<DispersionRecordSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      observerIndex: Joi.number().integer(),
-      centrelineConcentration: Joi.number().unsafe(),
-      downwindDistance: Joi.number().unsafe(),
-      time: Joi.number().unsafe(),
-      centrelineConcentrationUncorrected: Joi.number().unsafe(),
-      crosswindRadius: Joi.number().unsafe(),
-      verticalRadius: Joi.number().unsafe(),
-      crosswindExponent: Joi.number().unsafe(),
-      verticalExponent: Joi.number().unsafe(),
-      theta: Joi.number().unsafe(),
-      centrelineHeight: Joi.number().unsafe(),
-      liquidFraction: Joi.number().unsafe(),
-      vapourTemperature: Joi.number().unsafe(),
-      massConc: Joi.number().unsafe(),
-      velocity: Joi.number().unsafe(),
-      massFlow: Joi.number().unsafe(),
-      profileFlag: Joi.number().integer(),
-      elevFlag: Joi.number().integer(),
-      rhoCloud: Joi.number().unsafe(),
-      liqTemp: Joi.number().unsafe(),
-      effectiveWidth: Joi.number().unsafe(),
-      effectiveHeight: Joi.number().unsafe(),
-      passTranDist: Joi.number().unsafe(),
-      downwindRadius: Joi.number().unsafe(),
-      dropletDiameter: Joi.number().unsafe(),
-      dropletHeight: Joi.number().unsafe(),
-      dropletDistance: Joi.number().unsafe(),
-      mass: Joi.number().unsafe(),
-      instCon: Joi.string().valid(...Object.values(Enums.DynamicType)),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        observerIndex: Joi.number().integer(),
+        centrelineConcentration: Joi.number().unsafe(),
+        downwindDistance: Joi.number().unsafe(),
+        time: Joi.number().unsafe(),
+        centrelineConcentrationUncorrected: Joi.number().unsafe(),
+        crosswindRadius: Joi.number().unsafe(),
+        verticalRadius: Joi.number().unsafe(),
+        crosswindExponent: Joi.number().unsafe(),
+        verticalExponent: Joi.number().unsafe(),
+        theta: Joi.number().unsafe(),
+        centrelineHeight: Joi.number().unsafe(),
+        liquidFraction: Joi.number().unsafe(),
+        vapourTemperature: Joi.number().unsafe(),
+        massConc: Joi.number().unsafe(),
+        velocity: Joi.number().unsafe(),
+        massFlow: Joi.number().unsafe(),
+        profileFlag: Joi.number().integer(),
+        elevFlag: Joi.number().integer(),
+        rhoCloud: Joi.number().unsafe(),
+        liqTemp: Joi.number().unsafe(),
+        effectiveWidth: Joi.number().unsafe(),
+        effectiveHeight: Joi.number().unsafe(),
+        passTranDist: Joi.number().unsafe(),
+        downwindRadius: Joi.number().unsafe(),
+        dropletDiameter: Joi.number().unsafe(),
+        dropletHeight: Joi.number().unsafe(),
+        dropletDistance: Joi.number().unsafe(),
+        mass: Joi.number().unsafe(),
+        instCon: Joi.string().valid(...Object.values(Enums.DynamicType)),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       observerIndex: "number",
       centrelineConcentration: "number",
       downwindDistance: "number",
@@ -1082,16 +1057,11 @@ export class DispersionRecordSchema {
     };
   }
 
-  validate(data: DispersionRecordSchemaData): Entities.DispersionRecord {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: DispersionRecordSchemaData): Entities.DispersionRecord {
     return new Entities.DispersionRecord(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.observerIndex,
       data.centrelineConcentration,
       data.downwindDistance,
@@ -1125,7 +1095,7 @@ export class DispersionRecordSchema {
   }
 }
 
-export interface ExplosionConfinedVolumeSchemaData {
+export interface ExplosionConfinedVolumeSchemaData extends SchemaBaseData {
   confinedStrength: number;
   confinedVolume: number;
 }
@@ -1136,44 +1106,40 @@ export interface ExplosionConfinedVolumeSchemaData {
  * Description:  Confined explosion volume data.
  * ================================================================================
  */
-export class ExplosionConfinedVolumeSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class ExplosionConfinedVolumeSchema extends SchemaBase<ExplosionConfinedVolumeSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      confinedStrength: Joi.number().unsafe(),
-      confinedVolume: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        confinedStrength: Joi.number().unsafe(),
+        confinedVolume: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       confinedStrength: "number",
       confinedVolume: "number",
     };
   }
 
-  validate(data: ExplosionConfinedVolumeSchemaData): Entities.ExplosionConfinedVolume {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: ExplosionConfinedVolumeSchemaData): Entities.ExplosionConfinedVolume {
     return new Entities.ExplosionConfinedVolume(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.confinedStrength,
       data.confinedVolume
     );
   }
 }
 
-export interface ExplosionOutputConfigSchemaData {
+export interface ExplosionOutputConfigSchemaData extends SchemaBaseData {
   overpressureLevel: number;
   meConfinedMethod: Enums.MEConfinedMethod;
 }
@@ -1184,44 +1150,40 @@ export interface ExplosionOutputConfigSchemaData {
  * Description:  Explosion plotting and reporting parameters.
  * ================================================================================
  */
-export class ExplosionOutputConfigSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class ExplosionOutputConfigSchema extends SchemaBase<ExplosionOutputConfigSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      overpressureLevel: Joi.number().unsafe(),
-      meConfinedMethod: Joi.string().valid(...Object.values(Enums.MEConfinedMethod)),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        overpressureLevel: Joi.number().unsafe(),
+        meConfinedMethod: Joi.string().valid(...Object.values(Enums.MEConfinedMethod)),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       overpressureLevel: "number",
       meConfinedMethod: "Enums.MEConfinedMethod",
     };
   }
 
-  validate(data: ExplosionOutputConfigSchemaData): Entities.ExplosionOutputConfig {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: ExplosionOutputConfigSchemaData): Entities.ExplosionOutputConfig {
     return new Entities.ExplosionOutputConfig(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.overpressureLevel,
       data.meConfinedMethod
     );
   }
 }
 
-export interface ExplosionOverpressureResultSchemaData {
+export interface ExplosionOverpressureResultSchemaData extends SchemaBaseData {
   overpressure: number;
   explosionCentre: number;
   maximumDistance: number;
@@ -1236,26 +1198,27 @@ export interface ExplosionOverpressureResultSchemaData {
  * Description:  Worst case explosion summary results for a given overpressure.
  * ================================================================================
  */
-export class ExplosionOverpressureResultSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class ExplosionOverpressureResultSchema extends SchemaBase<ExplosionOverpressureResultSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      overpressure: Joi.number().unsafe(),
-      explosionCentre: Joi.number().unsafe(),
-      maximumDistance: Joi.number().unsafe(),
-      explodedMass: Joi.number().unsafe(),
-      ignitionTime: Joi.number().unsafe(),
-      radius: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        overpressure: Joi.number().unsafe(),
+        explosionCentre: Joi.number().unsafe(),
+        maximumDistance: Joi.number().unsafe(),
+        explodedMass: Joi.number().unsafe(),
+        ignitionTime: Joi.number().unsafe(),
+        radius: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       overpressure: "number",
       explosionCentre: "number",
       maximumDistance: "number",
@@ -1265,16 +1228,11 @@ export class ExplosionOverpressureResultSchema {
     };
   }
 
-  validate(data: ExplosionOverpressureResultSchemaData): Entities.ExplosionOverpressureResult {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: ExplosionOverpressureResultSchemaData): Entities.ExplosionOverpressureResult {
     return new Entities.ExplosionOverpressureResult(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.overpressure,
       data.explosionCentre,
       data.maximumDistance,
@@ -1285,7 +1243,7 @@ export class ExplosionOverpressureResultSchema {
   }
 }
 
-export interface ExplosionParametersSchemaData {
+export interface ExplosionParametersSchemaData extends SchemaBaseData {
   explosionUniformStrength: number;
 }
 
@@ -1295,41 +1253,37 @@ export interface ExplosionParametersSchemaData {
  * Description:  A set of parameters used in explosion calculations.
  * ================================================================================
  */
-export class ExplosionParametersSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class ExplosionParametersSchema extends SchemaBase<ExplosionParametersSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      explosionUniformStrength: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        explosionUniformStrength: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       explosionUniformStrength: "number",
     };
   }
 
-  validate(data: ExplosionParametersSchemaData): Entities.ExplosionParameters {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: ExplosionParametersSchemaData): Entities.ExplosionParameters {
     return new Entities.ExplosionParameters(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.explosionUniformStrength
     );
   }
 }
 
-export interface FlameRecordSchemaData {
+export interface FlameRecordSchemaData extends SchemaBaseData {
   xCoordinate: number;
   zCoordinate: number;
   rCoordinate: number;
@@ -1342,24 +1296,25 @@ export interface FlameRecordSchemaData {
  * Description:  A record containing flame geometry data.
  * ================================================================================
  */
-export class FlameRecordSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class FlameRecordSchema extends SchemaBase<FlameRecordSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      xCoordinate: Joi.number().unsafe(),
-      zCoordinate: Joi.number().unsafe(),
-      rCoordinate: Joi.number().unsafe(),
-      phiCoordinate: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        xCoordinate: Joi.number().unsafe(),
+        zCoordinate: Joi.number().unsafe(),
+        rCoordinate: Joi.number().unsafe(),
+        phiCoordinate: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       xCoordinate: "number",
       zCoordinate: "number",
       rCoordinate: "number",
@@ -1367,16 +1322,11 @@ export class FlameRecordSchema {
     };
   }
 
-  validate(data: FlameRecordSchemaData): Entities.FlameRecord {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: FlameRecordSchemaData): Entities.FlameRecord {
     return new Entities.FlameRecord(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.xCoordinate,
       data.zCoordinate,
       data.rCoordinate,
@@ -1385,7 +1335,7 @@ export class FlameRecordSchema {
   }
 }
 
-export interface FlameResultSchemaData {
+export interface FlameResultSchemaData extends SchemaBaseData {
   time: number;
   surfaceEmissivePower: number;
   flameLength: number;
@@ -1399,25 +1349,26 @@ export interface FlameResultSchemaData {
  * Description:  A set of flame results.
  * ================================================================================
  */
-export class FlameResultSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class FlameResultSchema extends SchemaBase<FlameResultSchemaData> {
   constructor() {
-    this.schema = 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)),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      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)),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       time: "number",
       surfaceEmissivePower: "number",
       flameLength: "number",
@@ -1426,16 +1377,11 @@ export class FlameResultSchema {
     };
   }
 
-  validate(data: FlameResultSchemaData): Entities.FlameResult {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: FlameResultSchemaData): Entities.FlameResult {
     return new Entities.FlameResult(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.time,
       data.surfaceEmissivePower,
       data.flameLength,
@@ -1445,7 +1391,7 @@ export class FlameResultSchema {
   }
 }
 
-export interface TransectSchemaData {
+export interface TransectSchemaData extends SchemaBaseData {
   transectStartPoint: Entities.LocalPosition;
   transectEndPoint: Entities.LocalPosition;
 }
@@ -1456,44 +1402,40 @@ export interface TransectSchemaData {
  * Description:  A line segment, along which results are provided.
  * ================================================================================
  */
-export class TransectSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class TransectSchema extends SchemaBase<TransectSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      transectStartPoint: new LocalPositionSchema().schema,
-      transectEndPoint: new LocalPositionSchema().schema,
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        transectStartPoint: new LocalPositionSchema().schema,
+        transectEndPoint: new LocalPositionSchema().schema,
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       transectStartPoint: "LocalPosition",
       transectEndPoint: "LocalPosition",
     };
   }
 
-  validate(data: TransectSchemaData): Entities.Transect {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: TransectSchemaData): Entities.Transect {
     return new Entities.Transect(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.transectStartPoint,
       data.transectEndPoint
     );
   }
 }
 
-export interface FlammableOutputConfigSchemaData {
+export interface FlammableOutputConfigSchemaData extends SchemaBaseData {
   position: Entities.LocalPosition;
   transect: Entities.Transect;
   radiationType: Enums.RadiationType;
@@ -1512,30 +1454,31 @@ export interface FlammableOutputConfigSchemaData {
  * Description:  Fire and radiation plotting and reporting parameters.
  * ================================================================================
  */
-export class FlammableOutputConfigSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class FlammableOutputConfigSchema extends SchemaBase<FlammableOutputConfigSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      position: new LocalPositionSchema().schema,
-      transect: new TransectSchema().schema,
-      radiationType: Joi.string().valid(...Object.values(Enums.RadiationType)),
-      contourType: Joi.string().valid(...Object.values(Enums.ContourType)),
-      radiationLevel: Joi.number().unsafe(),
-      radiationResolution: Joi.string().valid(...Object.values(Enums.Resolution)),
-      fixedOrientation: Joi.number().integer(),
-      orientation: Joi.number().unsafe(),
-      fixedInclination: Joi.number().integer(),
-      inclination: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        position: new LocalPositionSchema().schema,
+        transect: new TransectSchema().schema,
+        radiationType: Joi.string().valid(...Object.values(Enums.RadiationType)),
+        contourType: Joi.string().valid(...Object.values(Enums.ContourType)),
+        radiationLevel: Joi.number().unsafe(),
+        radiationResolution: Joi.string().valid(...Object.values(Enums.Resolution)),
+        fixedOrientation: Joi.number().integer(),
+        orientation: Joi.number().unsafe(),
+        fixedInclination: Joi.number().integer(),
+        inclination: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       position: "LocalPosition",
       transect: "Transect",
       radiationType: "Enums.RadiationType",
@@ -1549,16 +1492,11 @@ export class FlammableOutputConfigSchema {
     };
   }
 
-  validate(data: FlammableOutputConfigSchemaData): Entities.FlammableOutputConfig {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: FlammableOutputConfigSchemaData): Entities.FlammableOutputConfig {
     return new Entities.FlammableOutputConfig(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.position,
       data.transect,
       data.radiationType,
@@ -1573,7 +1511,7 @@ export class FlammableOutputConfigSchema {
   }
 }
 
-export interface FlammableParametersSchemaData {
+export interface FlammableParametersSchemaData extends SchemaBaseData {
   maxExposureDuration: number;
   radiationRelativeTolerance: number;
   poolFireType: Enums.PoolFireType;
@@ -1588,26 +1526,27 @@ export interface FlammableParametersSchemaData {
  * Description:  A set of parameters used in fire and radiation calculations.
  * ================================================================================
  */
-export class FlammableParametersSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class FlammableParametersSchema extends SchemaBase<FlammableParametersSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      maxExposureDuration: Joi.number().unsafe(),
-      radiationRelativeTolerance: Joi.number().unsafe(),
-      poolFireType: Joi.string().valid(...Object.values(Enums.PoolFireType)),
-      jetFireAutoSelect: Joi.boolean(),
-      timeAveraging: Joi.boolean(),
-      timeOfInterest: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        maxExposureDuration: Joi.number().unsafe(),
+        radiationRelativeTolerance: Joi.number().unsafe(),
+        poolFireType: Joi.string().valid(...Object.values(Enums.PoolFireType)),
+        jetFireAutoSelect: Joi.boolean(),
+        timeAveraging: Joi.boolean(),
+        timeOfInterest: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       maxExposureDuration: "number",
       radiationRelativeTolerance: "number",
       poolFireType: "Enums.PoolFireType",
@@ -1617,16 +1556,11 @@ export class FlammableParametersSchema {
     };
   }
 
-  validate(data: FlammableParametersSchemaData): Entities.FlammableParameters {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: FlammableParametersSchemaData): Entities.FlammableParameters {
     return new Entities.FlammableParameters(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.maxExposureDuration,
       data.radiationRelativeTolerance,
       data.poolFireType,
@@ -1637,7 +1571,7 @@ export class FlammableParametersSchema {
   }
 }
 
-export interface FlashResultSchemaData {
+export interface FlashResultSchemaData extends SchemaBaseData {
   pressure: number;
   temperature: number;
   liquidMoleFraction: number;
@@ -1662,36 +1596,37 @@ export interface FlashResultSchemaData {
  * Description:  Physical properties for a material generated at a particular pressure and temperature.
  * ================================================================================
  */
-export class FlashResultSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class FlashResultSchema extends SchemaBase<FlashResultSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      pressure: Joi.number().unsafe(),
-      temperature: Joi.number().unsafe(),
-      liquidMoleFraction: Joi.number().unsafe(),
-      liquidDensity: Joi.number().unsafe(),
-      vapourDensity: Joi.number().unsafe(),
-      liquidEntropy: Joi.number().unsafe(),
-      vapourEntropy: Joi.number().unsafe(),
-      liquidEnthalpy: Joi.number().unsafe(),
-      vapourEnthalpy: Joi.number().unsafe(),
-      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)),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        pressure: Joi.number().unsafe(),
+        temperature: Joi.number().unsafe(),
+        liquidMoleFraction: Joi.number().unsafe(),
+        liquidDensity: Joi.number().unsafe(),
+        vapourDensity: Joi.number().unsafe(),
+        liquidEntropy: Joi.number().unsafe(),
+        vapourEntropy: Joi.number().unsafe(),
+        liquidEnthalpy: Joi.number().unsafe(),
+        vapourEnthalpy: Joi.number().unsafe(),
+        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)),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       pressure: "number",
       temperature: "number",
       liquidMoleFraction: "number",
@@ -1711,16 +1646,11 @@ export class FlashResultSchema {
     };
   }
 
-  validate(data: FlashResultSchemaData): Entities.FlashResult {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: FlashResultSchemaData): Entities.FlashResult {
     return new Entities.FlashResult(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.pressure,
       data.temperature,
       data.liquidMoleFraction,
@@ -1741,7 +1671,7 @@ export class FlashResultSchema {
   }
 }
 
-export interface ReleaseOverTimeSchemaData {
+export interface ReleaseOverTimeSchemaData extends SchemaBaseData {
   releaseAngle: number;
   timeVaryingOption: Enums.TimeVaryingOption;
 }
@@ -1752,44 +1682,40 @@ export interface ReleaseOverTimeSchemaData {
  * Description:  Scenario representing a release over time.
  * ================================================================================
  */
-export class ReleaseOverTimeSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class ReleaseOverTimeSchema extends SchemaBase<ReleaseOverTimeSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      releaseAngle: Joi.number().unsafe(),
-      timeVaryingOption: Joi.string().valid(...Object.values(Enums.TimeVaryingOption)),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        releaseAngle: Joi.number().unsafe(),
+        timeVaryingOption: Joi.string().valid(...Object.values(Enums.TimeVaryingOption)),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       releaseAngle: "number",
       timeVaryingOption: "Enums.TimeVaryingOption",
     };
   }
 
-  validate(data: ReleaseOverTimeSchemaData): Entities.ReleaseOverTime {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: ReleaseOverTimeSchemaData): Entities.ReleaseOverTime {
     return new Entities.ReleaseOverTime(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.releaseAngle,
       data.timeVaryingOption
     );
   }
 }
 
-export interface LeakSchemaData {
+export interface LeakSchemaData extends SchemaBaseData {
   holeDiameter: number;
   releaseAngle: number;
   timeVaryingOption: Enums.TimeVaryingOption;
@@ -1803,25 +1729,26 @@ export interface LeakSchemaData {
  * Description:  A storage scenario which models a release of material through a hole in a vessel or pipe.
  * ================================================================================
  */
-export class LeakSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class LeakSchema extends SchemaBase<LeakSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      holeDiameter: Joi.number().unsafe(),
-      releaseAngle: Joi.number().unsafe(),
-      timeVaryingOption: Joi.string().valid(...Object.values(Enums.TimeVaryingOption)),
-      holeHeightFraction: Joi.number().unsafe(),
-      releaseElevation: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        holeDiameter: Joi.number().unsafe(),
+        releaseAngle: Joi.number().unsafe(),
+        timeVaryingOption: Joi.string().valid(...Object.values(Enums.TimeVaryingOption)),
+        holeHeightFraction: Joi.number().unsafe(),
+        releaseElevation: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       holeDiameter: "number",
       releaseAngle: "number",
       timeVaryingOption: "Enums.TimeVaryingOption",
@@ -1830,16 +1757,11 @@ export class LeakSchema {
     };
   }
 
-  validate(data: LeakSchemaData): Entities.Leak {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: LeakSchemaData): Entities.Leak {
     return new Entities.Leak(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.holeDiameter,
       data.releaseAngle,
       data.timeVaryingOption,
@@ -1849,7 +1771,7 @@ export class LeakSchema {
   }
 }
 
-export interface LineRuptureSchemaData {
+export interface LineRuptureSchemaData extends SchemaBaseData {
   pipeDiameter: number;
   pipeLength: number;
   releaseAngle: number;
@@ -1864,26 +1786,27 @@ export interface LineRuptureSchemaData {
  * Description:  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.
  * ================================================================================
  */
-export class LineRuptureSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class LineRuptureSchema extends SchemaBase<LineRuptureSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      pipeDiameter: Joi.number().unsafe(),
-      pipeLength: Joi.number().unsafe(),
-      releaseAngle: Joi.number().unsafe(),
-      timeVaryingOption: Joi.string().valid(...Object.values(Enums.TimeVaryingOption)),
-      pipeRoughness: Joi.number().unsafe(),
-      pipeHeightFraction: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    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)),
+        pipeRoughness: Joi.number().unsafe(),
+        pipeHeightFraction: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       pipeDiameter: "number",
       pipeLength: "number",
       releaseAngle: "number",
@@ -1893,16 +1816,11 @@ export class LineRuptureSchema {
     };
   }
 
-  validate(data: LineRuptureSchemaData): Entities.LineRupture {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: LineRuptureSchemaData): Entities.LineRupture {
     return new Entities.LineRupture(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.pipeDiameter,
       data.pipeLength,
       data.releaseAngle,
@@ -1913,7 +1831,7 @@ export class LineRuptureSchema {
   }
 }
 
-export interface MaterialComponentDataItemSchemaData {
+export interface MaterialComponentDataItemSchemaData extends SchemaBaseData {
   description: string;
   equationNumber: number;
   equationString: string;
@@ -1929,27 +1847,28 @@ export interface MaterialComponentDataItemSchemaData {
  * Description:  Material component data item.
  * ================================================================================
  */
-export class MaterialComponentDataItemSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class MaterialComponentDataItemSchema extends SchemaBase<MaterialComponentDataItemSchemaData> {
   constructor() {
-    this.schema = 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),
-      supercriticalExtrapolation: Joi.number().unsafe(),
-      fractionTc: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    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),
+        supercriticalExtrapolation: Joi.number().unsafe(),
+        fractionTc: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       description: "string",
       equationNumber: "number",
       equationString: "string",
@@ -1960,16 +1879,11 @@ export class MaterialComponentDataItemSchema {
     };
   }
 
-  validate(data: MaterialComponentDataItemSchemaData): Entities.MaterialComponentDataItem {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: MaterialComponentDataItemSchemaData): Entities.MaterialComponentDataItem {
     return new Entities.MaterialComponentDataItem(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.description,
       data.equationNumber,
       data.equationString,
@@ -1981,7 +1895,7 @@ export class MaterialComponentDataItemSchema {
   }
 }
 
-export interface MaterialComponentDataSchemaData {
+export interface MaterialComponentDataSchemaData extends SchemaBaseData {
   name: string;
   dipprVersion: number;
   casId: number;
@@ -1995,25 +1909,26 @@ export interface MaterialComponentDataSchemaData {
  * Description:  Data related to a MaterialComponent.
  * ================================================================================
  */
-export class MaterialComponentDataSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class MaterialComponentDataSchema extends SchemaBase<MaterialComponentDataSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      name: Joi.string().allow(""),
-      dipprVersion: Joi.number().integer(),
-      casId: Joi.number().integer(),
-      dataItem: Joi.array().items(new MaterialComponentDataItemSchema().schema).allow(null),
-      nonStandard: Joi.boolean(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    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),
+        nonStandard: Joi.boolean(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       name: "string",
       dipprVersion: "number",
       casId: "number",
@@ -2022,16 +1937,11 @@ export class MaterialComponentDataSchema {
     };
   }
 
-  validate(data: MaterialComponentDataSchemaData): Entities.MaterialComponentData {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: MaterialComponentDataSchemaData): Entities.MaterialComponentData {
     return new Entities.MaterialComponentData(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.name,
       data.dipprVersion,
       data.casId,
@@ -2041,7 +1951,7 @@ export class MaterialComponentDataSchema {
   }
 }
 
-export interface MixtureConstantPropertiesResultSchemaData {
+export interface MixtureConstantPropertiesResultSchemaData extends SchemaBaseData {
   lowerFlammabilityLimit: number;
   upperFlammabilityLimit: number;
   criticalPressure: number;
@@ -2066,36 +1976,37 @@ export interface MixtureConstantPropertiesResultSchemaData {
  * Description:  Constant properties of a mixture.
  * ================================================================================
  */
-export class MixtureConstantPropertiesResultSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class MixtureConstantPropertiesResultSchema extends SchemaBase<MixtureConstantPropertiesResultSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      lowerFlammabilityLimit: Joi.number().unsafe(),
-      upperFlammabilityLimit: Joi.number().unsafe(),
-      criticalPressure: Joi.number().unsafe(),
-      criticalTemperature: Joi.number().unsafe(),
-      flashPoint: Joi.number().unsafe(),
-      heatCombustion: Joi.number().unsafe(),
-      maximumBurnRate: Joi.number().unsafe(),
-      maximumSEP: Joi.number().unsafe(),
-      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)),
-      luminousSmokyFlame: Joi.string().valid(...Object.values(Enums.LuminousSmokyFlame)),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        lowerFlammabilityLimit: Joi.number().unsafe(),
+        upperFlammabilityLimit: Joi.number().unsafe(),
+        criticalPressure: Joi.number().unsafe(),
+        criticalTemperature: Joi.number().unsafe(),
+        flashPoint: Joi.number().unsafe(),
+        heatCombustion: Joi.number().unsafe(),
+        maximumBurnRate: Joi.number().unsafe(),
+        maximumSEP: Joi.number().unsafe(),
+        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)),
+        luminousSmokyFlame: Joi.string().valid(...Object.values(Enums.LuminousSmokyFlame)),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       lowerFlammabilityLimit: "number",
       upperFlammabilityLimit: "number",
       criticalPressure: "number",
@@ -2115,16 +2026,11 @@ export class MixtureConstantPropertiesResultSchema {
     };
   }
 
-  validate(data: MixtureConstantPropertiesResultSchemaData): Entities.MixtureConstantPropertiesResult {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: MixtureConstantPropertiesResultSchemaData): Entities.MixtureConstantPropertiesResult {
     return new Entities.MixtureConstantPropertiesResult(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.lowerFlammabilityLimit,
       data.upperFlammabilityLimit,
       data.criticalPressure,
@@ -2145,7 +2051,7 @@ export class MixtureConstantPropertiesResultSchema {
   }
 }
 
-export interface PipeSchemaData {
+export interface PipeSchemaData extends SchemaBaseData {
   location: Entities.LocalPosition;
   nodes: Entities.LocalPosition[];
   nodeCount: number;
@@ -2162,28 +2068,29 @@ export interface PipeSchemaData {
  * Description:  An asset to model events that involve releases from pressurised pipelines.
  * ================================================================================
  */
-export class PipeSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class PipeSchema extends SchemaBase<PipeSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      location: new LocalPositionSchema().schema,
-      nodes: Joi.array().items(new LocalPositionSchema().schema).allow(null),
-      nodeCount: Joi.number().integer(),
-      diameter: Joi.number().unsafe(),
-      material: new MaterialSchema().schema,
-      state: new StateSchema().schema,
-      roughness: Joi.number().unsafe(),
-      pumpedInflow: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        location: new LocalPositionSchema().schema,
+        nodes: Joi.array().items(new LocalPositionSchema().schema).allow(null),
+        nodeCount: Joi.number().integer(),
+        diameter: Joi.number().unsafe(),
+        material: new MaterialSchema().schema,
+        state: new StateSchema().schema,
+        roughness: Joi.number().unsafe(),
+        pumpedInflow: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       location: "LocalPosition",
       nodes: "LocalPosition[]",
       nodeCount: "number",
@@ -2195,16 +2102,11 @@ export class PipeSchema {
     };
   }
 
-  validate(data: PipeSchemaData): Entities.Pipe {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: PipeSchemaData): Entities.Pipe {
     return new Entities.Pipe(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.location,
       data.nodes,
       data.nodeCount,
@@ -2217,7 +2119,7 @@ export class PipeSchema {
   }
 }
 
-export interface PipeBreachSchemaData {
+export interface PipeBreachSchemaData extends SchemaBaseData {
   distanceDownstream: number;
   releaseAngle: number;
   timeVaryingOption: Enums.TimeVaryingOption;
@@ -2230,24 +2132,25 @@ export interface PipeBreachSchemaData {
  * Description:  A storage scenario which models a time-dependent release of material from its process or transport conditions in a pipeline.
  * ================================================================================
  */
-export class PipeBreachSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class PipeBreachSchema extends SchemaBase<PipeBreachSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      distanceDownstream: Joi.number().unsafe(),
-      releaseAngle: Joi.number().unsafe(),
-      timeVaryingOption: Joi.string().valid(...Object.values(Enums.TimeVaryingOption)),
-      relativeAperture: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        distanceDownstream: Joi.number().unsafe(),
+        releaseAngle: Joi.number().unsafe(),
+        timeVaryingOption: Joi.string().valid(...Object.values(Enums.TimeVaryingOption)),
+        relativeAperture: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       distanceDownstream: "number",
       releaseAngle: "number",
       timeVaryingOption: "Enums.TimeVaryingOption",
@@ -2255,16 +2158,11 @@ export class PipeBreachSchema {
     };
   }
 
-  validate(data: PipeBreachSchemaData): Entities.PipeBreach {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: PipeBreachSchemaData): Entities.PipeBreach {
     return new Entities.PipeBreach(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.distanceDownstream,
       data.releaseAngle,
       data.timeVaryingOption,
@@ -2273,7 +2171,7 @@ export class PipeBreachSchema {
   }
 }
 
-export interface PoolFireFlameResultSchemaData {
+export interface PoolFireFlameResultSchemaData extends SchemaBaseData {
   time: number;
   surfaceEmissivePower: number;
   flameLength: number;
@@ -2288,26 +2186,27 @@ export interface PoolFireFlameResultSchemaData {
  * Description:  Flame results for a pool fire.
  * ================================================================================
  */
-export class PoolFireFlameResultSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class PoolFireFlameResultSchema extends SchemaBase<PoolFireFlameResultSchemaData> {
   constructor() {
-    this.schema = 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),
-      fireType: Joi.string().valid(...Object.values(Enums.FireType)),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      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),
+        fireType: Joi.string().valid(...Object.values(Enums.FireType)),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       time: "number",
       surfaceEmissivePower: "number",
       flameLength: "number",
@@ -2317,16 +2216,11 @@ export class PoolFireFlameResultSchema {
     };
   }
 
-  validate(data: PoolFireFlameResultSchemaData): Entities.PoolFireFlameResult {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: PoolFireFlameResultSchemaData): Entities.PoolFireFlameResult {
     return new Entities.PoolFireFlameResult(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.time,
       data.surfaceEmissivePower,
       data.flameLength,
@@ -2337,7 +2231,7 @@ export class PoolFireFlameResultSchema {
   }
 }
 
-export interface PoolRecordSchemaData {
+export interface PoolRecordSchemaData extends SchemaBaseData {
   time: number;
   massSpilt: number;
   massVaporised: number;
@@ -2359,33 +2253,34 @@ export interface PoolRecordSchemaData {
  * Description:  A record containing pool results at a given time.
  * ================================================================================
  */
-export class PoolRecordSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class PoolRecordSchema extends SchemaBase<PoolRecordSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      time: Joi.number().unsafe(),
-      massSpilt: Joi.number().unsafe(),
-      massVaporised: Joi.number().unsafe(),
-      massDissolved: Joi.number().unsafe(),
-      massRemaining: Joi.number().unsafe(),
-      vapourisationRate: Joi.number().unsafe(),
-      solutionRate: Joi.number().unsafe(),
-      effectiveRadius: Joi.number().unsafe(),
-      depth: Joi.number().unsafe(),
-      temperature: Joi.number().unsafe(),
-      spillRate: Joi.number().unsafe(),
-      actualRadius: Joi.number().unsafe(),
-      poolCentre: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        time: Joi.number().unsafe(),
+        massSpilt: Joi.number().unsafe(),
+        massVaporised: Joi.number().unsafe(),
+        massDissolved: Joi.number().unsafe(),
+        massRemaining: Joi.number().unsafe(),
+        vapourisationRate: Joi.number().unsafe(),
+        solutionRate: Joi.number().unsafe(),
+        effectiveRadius: Joi.number().unsafe(),
+        depth: Joi.number().unsafe(),
+        temperature: Joi.number().unsafe(),
+        spillRate: Joi.number().unsafe(),
+        actualRadius: Joi.number().unsafe(),
+        poolCentre: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       time: "number",
       massSpilt: "number",
       massVaporised: "number",
@@ -2402,16 +2297,11 @@ export class PoolRecordSchema {
     };
   }
 
-  validate(data: PoolRecordSchemaData): Entities.PoolRecord {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: PoolRecordSchemaData): Entities.PoolRecord {
     return new Entities.PoolRecord(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.time,
       data.massSpilt,
       data.massVaporised,
@@ -2429,7 +2319,7 @@ export class PoolRecordSchema {
   }
 }
 
-export interface PoolVapourisationParametersSchemaData {
+export interface PoolVapourisationParametersSchemaData extends SchemaBaseData {
   toxicsCutoffRate: number;
   flammableCutoffRate: number;
   relativeTolerance: number;
@@ -2441,39 +2331,35 @@ export interface PoolVapourisationParametersSchemaData {
  * Description:  Pool vapourisation parameters
  * ================================================================================
  */
-export class PoolVapourisationParametersSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class PoolVapourisationParametersSchema extends SchemaBase<PoolVapourisationParametersSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      toxicsCutoffRate: Joi.number().unsafe(),
-      flammableCutoffRate: Joi.number().unsafe(),
-      relativeTolerance: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        toxicsCutoffRate: Joi.number().unsafe(),
+        flammableCutoffRate: Joi.number().unsafe(),
+        relativeTolerance: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       toxicsCutoffRate: "number",
       flammableCutoffRate: "number",
       relativeTolerance: "number",
     };
   }
 
-  validate(data: PoolVapourisationParametersSchemaData): Entities.PoolVapourisationParameters {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: PoolVapourisationParametersSchemaData): Entities.PoolVapourisationParameters {
     return new Entities.PoolVapourisationParameters(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.toxicsCutoffRate,
       data.flammableCutoffRate,
       data.relativeTolerance
@@ -2481,7 +2367,7 @@ export class PoolVapourisationParametersSchema {
   }
 }
 
-export interface RadiationRecordSchemaData {
+export interface RadiationRecordSchemaData extends SchemaBaseData {
   position: Entities.LocalPosition;
   radiationResult: number;
   radiationType: Enums.RadiationType;
@@ -2493,39 +2379,35 @@ export interface RadiationRecordSchemaData {
  * Description:  A record of the radiation type and level at a specific point (x,y,z).
  * ================================================================================
  */
-export class RadiationRecordSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class RadiationRecordSchema extends SchemaBase<RadiationRecordSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      position: new LocalPositionSchema().schema,
-      radiationResult: Joi.number().unsafe(),
-      radiationType: Joi.string().valid(...Object.values(Enums.RadiationType)),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        position: new LocalPositionSchema().schema,
+        radiationResult: Joi.number().unsafe(),
+        radiationType: Joi.string().valid(...Object.values(Enums.RadiationType)),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       position: "LocalPosition",
       radiationResult: "number",
       radiationType: "Enums.RadiationType",
     };
   }
 
-  validate(data: RadiationRecordSchemaData): Entities.RadiationRecord {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: RadiationRecordSchemaData): Entities.RadiationRecord {
     return new Entities.RadiationRecord(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.position,
       data.radiationResult,
       data.radiationType
@@ -2533,7 +2415,7 @@ export class RadiationRecordSchema {
   }
 }
 
-export interface ReliefValveSchemaData {
+export interface ReliefValveSchemaData extends SchemaBaseData {
   reliefValveConstrictionDiameter: number;
   pipeDiameter: number;
   pipeLength: number;
@@ -2549,27 +2431,28 @@ export interface ReliefValveSchemaData {
  * Description:  A storage scenario which models a release of material from the vapour side of a vessel due to the lifting of a relief valve.
  * ================================================================================
  */
-export class ReliefValveSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class ReliefValveSchema extends SchemaBase<ReliefValveSchemaData> {
   constructor() {
-    this.schema = 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)),
-      pipeRoughness: Joi.number().unsafe(),
-      pipeHeightFraction: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    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)),
+        pipeRoughness: Joi.number().unsafe(),
+        pipeHeightFraction: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       reliefValveConstrictionDiameter: "number",
       pipeDiameter: "number",
       pipeLength: "number",
@@ -2580,16 +2463,11 @@ export class ReliefValveSchema {
     };
   }
 
-  validate(data: ReliefValveSchemaData): Entities.ReliefValve {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: ReliefValveSchemaData): Entities.ReliefValve {
     return new Entities.ReliefValve(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.reliefValveConstrictionDiameter,
       data.pipeDiameter,
       data.pipeLength,
@@ -2601,7 +2479,7 @@ export class ReliefValveSchema {
   }
 }
 
-export interface ScalarUdmOutputsSchemaData {
+export interface ScalarUdmOutputsSchemaData extends SchemaBaseData {
   observerCount: number;
   recordCount: number;
   minimumConcentration: number;
@@ -2617,27 +2495,28 @@ export interface ScalarUdmOutputsSchemaData {
  * Description:  Scalar UDM output values required for post processing dispersion results.
  * ================================================================================
  */
-export class ScalarUdmOutputsSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class ScalarUdmOutputsSchema extends SchemaBase<ScalarUdmOutputsSchemaData> {
   constructor() {
-    this.schema = 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)),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      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)),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       observerCount: "number",
       recordCount: "number",
       minimumConcentration: "number",
@@ -2648,16 +2527,11 @@ export class ScalarUdmOutputsSchema {
     };
   }
 
-  validate(data: ScalarUdmOutputsSchemaData): Entities.ScalarUdmOutputs {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: ScalarUdmOutputsSchemaData): Entities.ScalarUdmOutputs {
     return new Entities.ScalarUdmOutputs(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.observerCount,
       data.recordCount,
       data.minimumConcentration,
@@ -2669,7 +2543,7 @@ export class ScalarUdmOutputsSchema {
   }
 }
 
-export interface ShortPipeRuptureSchemaData {
+export interface ShortPipeRuptureSchemaData extends SchemaBaseData {
   pipeLength: number;
   pipeDiameter: number;
   releaseAngle: number;
@@ -2684,26 +2558,27 @@ export interface ShortPipeRuptureSchemaData {
  * Description:  Short pipe rupture scenario
  * ================================================================================
  */
-export class ShortPipeRuptureSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class ShortPipeRuptureSchema extends SchemaBase<ShortPipeRuptureSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      pipeLength: Joi.number().unsafe(),
-      pipeDiameter: Joi.number().unsafe(),
-      releaseAngle: Joi.number().unsafe(),
-      timeVaryingOption: Joi.string().valid(...Object.values(Enums.TimeVaryingOption)),
-      pipeRoughness: Joi.number().unsafe(),
-      pipeHeightFraction: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    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)),
+        pipeRoughness: Joi.number().unsafe(),
+        pipeHeightFraction: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       pipeLength: "number",
       pipeDiameter: "number",
       releaseAngle: "number",
@@ -2713,16 +2588,11 @@ export class ShortPipeRuptureSchema {
     };
   }
 
-  validate(data: ShortPipeRuptureSchemaData): Entities.ShortPipeRupture {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: ShortPipeRuptureSchemaData): Entities.ShortPipeRupture {
     return new Entities.ShortPipeRupture(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.pipeLength,
       data.pipeDiameter,
       data.releaseAngle,
@@ -2733,7 +2603,7 @@ export class ShortPipeRuptureSchema {
   }
 }
 
-export interface StructureSchemaData {
+export interface StructureSchemaData extends SchemaBaseData {
   explosionConfinedVolume: Entities.ExplosionConfinedVolume;
   location: Entities.LocalPosition;
 }
@@ -2744,44 +2614,40 @@ export interface StructureSchemaData {
  * Description:  A building or process plant structure.
  * ================================================================================
  */
-export class StructureSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class StructureSchema extends SchemaBase<StructureSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      explosionConfinedVolume: new ExplosionConfinedVolumeSchema().schema,
-      location: new LocalPositionSchema().schema,
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        explosionConfinedVolume: new ExplosionConfinedVolumeSchema().schema,
+        location: new LocalPositionSchema().schema,
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       explosionConfinedVolume: "ExplosionConfinedVolume",
       location: "LocalPosition",
     };
   }
 
-  validate(data: StructureSchemaData): Entities.Structure {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: StructureSchemaData): Entities.Structure {
     return new Entities.Structure(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.explosionConfinedVolume,
       data.location
     );
   }
 }
 
-export interface SubstrateSchemaData {
+export interface SubstrateSchemaData extends SchemaBaseData {
   bund: Entities.Bund;
   surfaceRoughness: number;
   surfaceType: Enums.SurfaceType;
@@ -2794,24 +2660,25 @@ export interface SubstrateSchemaData {
  * Description:  The ground over which a release is taking place.
  * ================================================================================
  */
-export class SubstrateSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class SubstrateSchema extends SchemaBase<SubstrateSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      bund: new BundSchema().schema,
-      surfaceRoughness: Joi.number().unsafe(),
-      surfaceType: Joi.string().valid(...Object.values(Enums.SurfaceType)),
-      poolSurfaceType: Joi.string().valid(...Object.values(Enums.PoolSurfaceType)),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        bund: new BundSchema().schema,
+        surfaceRoughness: Joi.number().unsafe(),
+        surfaceType: Joi.string().valid(...Object.values(Enums.SurfaceType)),
+        poolSurfaceType: Joi.string().valid(...Object.values(Enums.PoolSurfaceType)),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       bund: "Bund",
       surfaceRoughness: "number",
       surfaceType: "Enums.SurfaceType",
@@ -2819,16 +2686,11 @@ export class SubstrateSchema {
     };
   }
 
-  validate(data: SubstrateSchemaData): Entities.Substrate {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: SubstrateSchemaData): Entities.Substrate {
     return new Entities.Substrate(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.bund,
       data.surfaceRoughness,
       data.surfaceType,
@@ -2837,7 +2699,7 @@ export class SubstrateSchema {
   }
 }
 
-export interface ToxicRecordSchemaData {
+export interface ToxicRecordSchemaData extends SchemaBaseData {
   position: Entities.LocalPosition;
   toxicResult: number;
   toxicResultType: Enums.ToxicResultType;
@@ -2849,39 +2711,35 @@ export interface ToxicRecordSchemaData {
  * Description:  A record of the toxic result type and level at a specific point (x,y,z).
  * ================================================================================
  */
-export class ToxicRecordSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class ToxicRecordSchema extends SchemaBase<ToxicRecordSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      position: new LocalPositionSchema().schema,
-      toxicResult: Joi.number().unsafe(),
-      toxicResultType: Joi.string().valid(...Object.values(Enums.ToxicResultType)),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        position: new LocalPositionSchema().schema,
+        toxicResult: Joi.number().unsafe(),
+        toxicResultType: Joi.string().valid(...Object.values(Enums.ToxicResultType)),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       position: "LocalPosition",
       toxicResult: "number",
       toxicResultType: "Enums.ToxicResultType",
     };
   }
 
-  validate(data: ToxicRecordSchemaData): Entities.ToxicRecord {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: ToxicRecordSchemaData): Entities.ToxicRecord {
     return new Entities.ToxicRecord(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.position,
       data.toxicResult,
       data.toxicResultType
@@ -2889,7 +2747,7 @@ export class ToxicRecordSchema {
   }
 }
 
-export interface VesselSchemaData {
+export interface VesselSchemaData extends SchemaBaseData {
   location: Entities.LocalPosition;
   state: Entities.State;
   material: Entities.Material;
@@ -2908,30 +2766,31 @@ export interface VesselSchemaData {
  * Description:  A pressue vessel asset to represent pressurised containment.
  * ================================================================================
  */
-export class VesselSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class VesselSchema extends SchemaBase<VesselSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      location: new LocalPositionSchema().schema,
-      state: new StateSchema().schema,
-      material: new MaterialSchema().schema,
-      diameter: Joi.number().unsafe(),
-      height: Joi.number().unsafe(),
-      length: Joi.number().unsafe(),
-      width: Joi.number().unsafe(),
-      shape: Joi.string().valid(...Object.values(Enums.VesselShape)),
-      vesselConditions: Joi.string().valid(...Object.values(Enums.VesselConditions)),
-      liquidFillFractionByVolume: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        location: new LocalPositionSchema().schema,
+        state: new StateSchema().schema,
+        material: new MaterialSchema().schema,
+        diameter: Joi.number().unsafe(),
+        height: Joi.number().unsafe(),
+        length: Joi.number().unsafe(),
+        width: Joi.number().unsafe(),
+        shape: Joi.string().valid(...Object.values(Enums.VesselShape)),
+        vesselConditions: Joi.string().valid(...Object.values(Enums.VesselConditions)),
+        liquidFillFractionByVolume: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       location: "LocalPosition",
       state: "State",
       material: "Material",
@@ -2945,16 +2804,11 @@ export class VesselSchema {
     };
   }
 
-  validate(data: VesselSchemaData): Entities.Vessel {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: VesselSchemaData): Entities.Vessel {
     return new Entities.Vessel(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.location,
       data.state,
       data.material,
@@ -2969,7 +2823,7 @@ export class VesselSchema {
   }
 }
 
-export interface VesselLeakMaxFlammableCloudResultsSchemaData {
+export interface VesselLeakMaxFlammableCloudResultsSchemaData extends SchemaBaseData {
   dischargeRate: number;
   expandedTemperature: number;
   lflExtent: number;
@@ -2984,26 +2838,27 @@ export interface VesselLeakMaxFlammableCloudResultsSchemaData {
  * Description:  Results for a linked run of vessel leak followed by dispersion and views from the cloud.
  * ================================================================================
  */
-export class VesselLeakMaxFlammableCloudResultsSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class VesselLeakMaxFlammableCloudResultsSchema extends SchemaBase<VesselLeakMaxFlammableCloudResultsSchemaData> {
   constructor() {
-    this.schema = 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)),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      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)),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       dischargeRate: "number",
       expandedTemperature: "number",
       lflExtent: "number",
@@ -3013,16 +2868,11 @@ export class VesselLeakMaxFlammableCloudResultsSchema {
     };
   }
 
-  validate(data: VesselLeakMaxFlammableCloudResultsSchemaData): Entities.VesselLeakMaxFlammableCloudResults {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: VesselLeakMaxFlammableCloudResultsSchemaData): Entities.VesselLeakMaxFlammableCloudResults {
     return new Entities.VesselLeakMaxFlammableCloudResults(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.dischargeRate,
       data.expandedTemperature,
       data.lflExtent,
@@ -3033,7 +2883,7 @@ export class VesselLeakMaxFlammableCloudResultsSchema {
   }
 }
 
-export interface VesselSphereSchemaData {
+export interface VesselSphereSchemaData extends SchemaBaseData {
   location: Entities.LocalPosition;
   state: Entities.State;
   material: Entities.Material;
@@ -3046,24 +2896,25 @@ export interface VesselSphereSchemaData {
  * Description:  A spherical pressue vessel asset to represent pressurised containment.
  * ================================================================================
  */
-export class VesselSphereSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class VesselSphereSchema extends SchemaBase<VesselSphereSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      location: new LocalPositionSchema().schema,
-      state: new StateSchema().schema,
-      material: new MaterialSchema().schema,
-      massInventory: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        location: new LocalPositionSchema().schema,
+        state: new StateSchema().schema,
+        material: new MaterialSchema().schema,
+        massInventory: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       location: "LocalPosition",
       state: "State",
       material: "Material",
@@ -3071,16 +2922,11 @@ export class VesselSphereSchema {
     };
   }
 
-  validate(data: VesselSphereSchemaData): Entities.VesselSphere {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: VesselSphereSchemaData): Entities.VesselSphere {
     return new Entities.VesselSphere(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.location,
       data.state,
       data.material,
@@ -3089,7 +2935,7 @@ export class VesselSphereSchema {
   }
 }
 
-export interface WeatherSchemaData {
+export interface WeatherSchemaData extends SchemaBaseData {
   windSpeed: number;
   stabilityClass: Enums.AtmosphericStabilityClass;
   temperature: number;
@@ -3104,26 +2950,27 @@ export interface WeatherSchemaData {
  * Description:  A set of weather conditions for use in the modelling of a release and its effects.
  * ================================================================================
  */
-export class WeatherSchema {
-  schema: Joi.ObjectSchema;
-  propertyTypes: Record<string, unknown>;
-
+export class WeatherSchema extends SchemaBase<WeatherSchemaData> {
   constructor() {
-    this.schema = Joi.object({
-      windSpeed: Joi.number().unsafe(),
-      stabilityClass: Joi.string().valid(...Object.values(Enums.AtmosphericStabilityClass)),
-      temperature: Joi.number().unsafe(),
-      relativeHumidity: Joi.number().unsafe(),
-      mixingLayerHeight: Joi.number().unsafe(),
-      solarRadiation: Joi.number().unsafe(),
-    })
-      .pattern(
-        ignoredPropertiesRegex,
-        Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
-      )
-      .unknown(false);
+    super();
+    this.schema = this.schema.concat(
+      Joi.object({
+        windSpeed: Joi.number().unsafe(),
+        stabilityClass: Joi.string().valid(...Object.values(Enums.AtmosphericStabilityClass)),
+        temperature: Joi.number().unsafe(),
+        relativeHumidity: Joi.number().unsafe(),
+        mixingLayerHeight: Joi.number().unsafe(),
+        solarRadiation: Joi.number().unsafe(),
+      })
+    )
+    .pattern(
+      ignoredPropertiesRegex,
+      Joi.alternatives().try(Joi.string(), Joi.number(), Joi.date(), Joi.any())
+    )
+    .unknown(false);
 
     this.propertyTypes = {
+      ...this.propertyTypes,
       windSpeed: "number",
       stabilityClass: "Enums.AtmosphericStabilityClass",
       temperature: "number",
@@ -3133,16 +2980,11 @@ export class WeatherSchema {
     };
   }
 
-  validate(data: WeatherSchemaData): Entities.Weather {
-    const { error, value } = this.schema.validate(data, { abortEarly: false });
-    if (error) {
-      throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
-    }
-    return this.makeEntity(value);
-  }
-
   makeEntity(data: WeatherSchemaData): Entities.Weather {
     return new Entities.Weather(
+      data.id,
+      data.typeId,
+      data.displayName,
       data.windSpeed,
       data.stabilityClass,
       data.temperature,