@dnv-plant/typescriptpws 1.0.86 → 1.0.88

package/src/calculations/linkedRunners.ts

@@ -6,12 +6,10 @@
 * Editing it may lead to inconsistent results and limit DNV's ability to provide support.
 * Please contact DNV if you believe changes are required.
 *
-* Version:   1.0.86
-* Date/time: 10 Jul 2025 09:49:06
+* Version:   1.0.89
+* Date/time: 29 Jul 2025 17:59:11
 * Template:  templates/typescriptpws/calculations.razor.
- ***********************************************************************/
-
-
+***********************************************************************/
 
 import * as Enums from "../enums";
 import * as Entities from "../entities";
@@ -36,12 +34,17 @@ class CalculationBase {
   messages: string[] = [];
   calculationElapsedTime?: number = 0.0;
   operationId?: string = "";
+  controller?: AbortController;
+
+  constructor(controller?: AbortController) {
+    this.controller = controller;
+  }
 
   /**
    * Post JSON to URL and time the call
    */
   async postRequest(url: string, data: string): Promise<AxiosResponse> {
-    return postRequest(url, data);
+    return postRequest(url, data, this.controller);
   }
 
   /**
@@ -153,15 +156,11 @@ class CalculationFailedResponseSchema {
   }
   }
     
-export interface UserDefinedSourceLinkedRunCalculationRequestSchemaData {
-  material: Entities.Material;
-  dischargeResult: Entities.DischargeResult;
-  dischargeRecords: Entities.DischargeRecord[];
-  dischargeRecordCount: number;
-  phaseToBeReleased: Enums.Phase;
-  dischargeParameters: Entities.DischargeParameters;
-  substrate: Entities.Substrate;
+export interface BESSLinkedRunnerCalculationRequestSchemaData {
+  bessUnit: Entities.BESSUnit;
+  bessRelease: Entities.BESSRelease;
   weather: Entities.Weather;
+  substrate: Entities.Substrate;
   dispersionParameters: Entities.DispersionParameters[];
   dispersionParameterCount: number;
   endPointConcentration: number;
@@ -179,15 +178,11 @@ export interface UserDefinedSourceLinkedRunCalculationRequestSchemaData {
   explosionConfinedVolumeCount: number;
 }
 
-class UserDefinedSourceLinkedRunCalculationRequest extends CalculationRequestBase {
-  material: Entities.Material;
-  dischargeResult: Entities.DischargeResult;
-  dischargeRecords: Entities.DischargeRecord[];
-  dischargeRecordCount: number;
-  phaseToBeReleased: Enums.Phase;
-  dischargeParameters: Entities.DischargeParameters;
-  substrate: Entities.Substrate;
+class BESSLinkedRunnerCalculationRequest extends CalculationRequestBase {
+  bessUnit: Entities.BESSUnit;
+  bessRelease: Entities.BESSRelease;
   weather: Entities.Weather;
+  substrate: Entities.Substrate;
   dispersionParameters: Entities.DispersionParameters[];
   dispersionParameterCount: number;
   endPointConcentration: number;
@@ -205,41 +200,14 @@ class UserDefinedSourceLinkedRunCalculationRequest extends CalculationRequestBas
   explosionConfinedVolumeCount: number;
 
   /**
-   * UserDefinedSourceLinkedRun calculation request class.
+   * BESSLinkedRunner calculation request class.
    *
-   * @param {Entities.Material} material -  a material entity.
-   * @param {Entities.DischargeResult} dischargeResult - Scalar discharge data.
-   * @param {Entities.DischargeRecord[]} dischargeRecords -  an array of discharge records.
-   * @param {number} dischargeRecordCount - Number of discharge records.
-   * @param {Enums.Phase} phaseToBeReleased - Phase to be released ( vapour, two-phase or liquid).
-   * @param {Entities.DischargeParameters} dischargeParameters -  a discharge parameters entity.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionParameters[]} dispersionParameters -  an array of dispersion parameters.
-   * @param {number} dispersionParameterCount - Number of dispersion parameters.
-   * @param {number} endPointConcentration - Concentration at which the dispersion calculations will terminate (v/v fraction).
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.ExplosionParameters} explosionParameters -  an explosion parameters entity.
-   * @param {Entities.DispersionOutputConfig[]} dispersionFlamOutputConfigs -  an array of dispersion output configs for flammable concentrations of interest.
-   * @param {number} dispersionFlamOutputConfigCount - Number of dispersion output configs for flammable concentrations of interest.
-   * @param {Entities.DispersionOutputConfig[]} dispersionToxicOutputConfigs -  an array of dispersion output configs for toxic concentrations of interest.
-   * @param {number} dispersionToxicOutputConfigCount - Number of dispersion output configs for toxic concentrations of interest.
-   * @param {Entities.FlammableOutputConfig[]} flammableOutputConfigs -  an array of flammable output configs for radiation levels of interest.
-   * @param {number} flammableOutputConfigCount - Number of flammable ouput configs for radiation levels of interest.
-   * @param {Entities.ExplosionOutputConfig[]} explosionOutputConfigs -  an array of explosion output configs for overpressure levels of interest.
-   * @param {number} explosionOutputConfigCount - Number of explosion output configs for overpressure levels of interest.
-   * @param {Entities.ExplosionConfinedVolume[]} explosionConfinedVolumes -  an array of explosion confined volumes.
-   * @param {number} explosionConfinedVolumeCount - Number of explosion confined volumes.
    */
-  constructor(
-    material: Entities.Material,
-    dischargeResult: Entities.DischargeResult,
-    dischargeRecords: Entities.DischargeRecord[],
-    dischargeRecordCount: number,
-    phaseToBeReleased: Enums.Phase,
-    dischargeParameters: Entities.DischargeParameters,
-    substrate: Entities.Substrate,
+  constructor(data: {
+    bessUnit: Entities.BESSUnit,
+    bessRelease: Entities.BESSRelease,
     weather: Entities.Weather,
+    substrate: Entities.Substrate,
     dispersionParameters: Entities.DispersionParameters[],
     dispersionParameterCount: number,
     endPointConcentration: number,
@@ -255,51 +223,43 @@ class UserDefinedSourceLinkedRunCalculationRequest extends CalculationRequestBas
     explosionOutputConfigCount: number,
     explosionConfinedVolumes: Entities.ExplosionConfinedVolume[],
     explosionConfinedVolumeCount: number
-  ) {
+  }) {
     super();
-    this.material = material;
-    this.dischargeResult = dischargeResult;
-    this.dischargeRecords = dischargeRecords;
-    this.dischargeRecordCount = dischargeRecordCount;
-    this.phaseToBeReleased = phaseToBeReleased;
-    this.dischargeParameters = dischargeParameters;
-    this.substrate = substrate;
-    this.weather = weather;
-    this.dispersionParameters = dispersionParameters;
-    this.dispersionParameterCount = dispersionParameterCount;
-    this.endPointConcentration = endPointConcentration;
-    this.flammableParameters = flammableParameters;
-    this.explosionParameters = explosionParameters;
-    this.dispersionFlamOutputConfigs = dispersionFlamOutputConfigs;
-    this.dispersionFlamOutputConfigCount = dispersionFlamOutputConfigCount;
-    this.dispersionToxicOutputConfigs = dispersionToxicOutputConfigs;
-    this.dispersionToxicOutputConfigCount = dispersionToxicOutputConfigCount;
-    this.flammableOutputConfigs = flammableOutputConfigs;
-    this.flammableOutputConfigCount = flammableOutputConfigCount;
-    this.explosionOutputConfigs = explosionOutputConfigs;
-    this.explosionOutputConfigCount = explosionOutputConfigCount;
-    this.explosionConfinedVolumes = explosionConfinedVolumes;
-    this.explosionConfinedVolumeCount = explosionConfinedVolumeCount;
+    this.bessUnit = data.bessUnit;
+    this.bessRelease = data.bessRelease;
+    this.weather = data.weather;
+    this.substrate = data.substrate;
+    this.dispersionParameters = data.dispersionParameters;
+    this.dispersionParameterCount = data.dispersionParameterCount;
+    this.endPointConcentration = data.endPointConcentration;
+    this.flammableParameters = data.flammableParameters;
+    this.explosionParameters = data.explosionParameters;
+    this.dispersionFlamOutputConfigs = data.dispersionFlamOutputConfigs;
+    this.dispersionFlamOutputConfigCount = data.dispersionFlamOutputConfigCount;
+    this.dispersionToxicOutputConfigs = data.dispersionToxicOutputConfigs;
+    this.dispersionToxicOutputConfigCount = data.dispersionToxicOutputConfigCount;
+    this.flammableOutputConfigs = data.flammableOutputConfigs;
+    this.flammableOutputConfigCount = data.flammableOutputConfigCount;
+    this.explosionOutputConfigs = data.explosionOutputConfigs;
+    this.explosionOutputConfigCount = data.explosionOutputConfigCount;
+    this.explosionConfinedVolumes = data.explosionConfinedVolumes;
+    this.explosionConfinedVolumeCount = data.explosionConfinedVolumeCount;
   }
 }
 
-export class UserDefinedSourceLinkedRunCalculationRequestSchema {
+export class BESSLinkedRunnerCalculationRequestSchema {
   schema: Joi.ObjectSchema;
   propertyTypes: Record<string, string>;
 
   /**
-   * Schema for the UserDefinedSourceLinkedRun calculation request.
+   * Schema for the BESSLinkedRunner calculation request.
    */
   constructor() {
     this.schema = Joi.object({
-      material: new EntitySchemas.MaterialSchema().schema,
-      dischargeResult: new EntitySchemas.DischargeResultSchema().schema,
-      dischargeRecords: Joi.array().items(new EntitySchemas.DischargeRecordSchema().schema).allow(null),
-      dischargeRecordCount: Joi.number().integer(),
-      phaseToBeReleased: Joi.string().valid(...Object.values(Enums.Phase)),
-      dischargeParameters: new EntitySchemas.DischargeParametersSchema().schema,
-      substrate: new EntitySchemas.SubstrateSchema().schema,
+      bessUnit: new EntitySchemas.BESSUnitSchema().schema,
+      bessRelease: new EntitySchemas.BESSReleaseSchema().schema,
       weather: new EntitySchemas.WeatherSchema().schema,
+      substrate: new EntitySchemas.SubstrateSchema().schema,
       dispersionParameters: Joi.array().items(new EntitySchemas.DispersionParametersSchema().schema).allow(null),
       dispersionParameterCount: Joi.number().integer(),
       endPointConcentration: Joi.number().unsafe(),
@@ -318,14 +278,10 @@ export class UserDefinedSourceLinkedRunCalculationRequestSchema {
     }).unknown(true);
 
     this.propertyTypes = {
-      material: "Entities.Material",
-      dischargeResult: "Entities.DischargeResult",
-      dischargeRecords: "Entities.DischargeRecord[]",
-      dischargeRecordCount: "number",
-      phaseToBeReleased: "Enums.Phase",
-      dischargeParameters: "Entities.DischargeParameters",
-      substrate: "Entities.Substrate",
+      bessUnit: "Entities.BESSUnit",
+      bessRelease: "Entities.BESSRelease",
       weather: "Entities.Weather",
+      substrate: "Entities.Substrate",
       dispersionParameters: "Entities.DispersionParameters[]",
       dispersionParameterCount: "number",
       endPointConcentration: "number",
@@ -344,7 +300,7 @@ export class UserDefinedSourceLinkedRunCalculationRequestSchema {
     };
   }
 
-  validate(data: UserDefinedSourceLinkedRunCalculationRequestSchemaData): UserDefinedSourceLinkedRunCalculationRequest {
+  validate(data: BESSLinkedRunnerCalculationRequestSchemaData): BESSLinkedRunnerCalculationRequest {
     const { error, value } = this.schema.validate(data, { abortEarly: false });
     if (error) {
       throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
@@ -352,44 +308,16 @@ export class UserDefinedSourceLinkedRunCalculationRequestSchema {
     return this.makeCalculationRequest(value);
   }
 
-  makeCalculationRequest(data: UserDefinedSourceLinkedRunCalculationRequestSchemaData): UserDefinedSourceLinkedRunCalculationRequest {
-    return new UserDefinedSourceLinkedRunCalculationRequest(
-      data.material,
-      data.dischargeResult,
-      data.dischargeRecords,
-      data.dischargeRecordCount,
-      data.phaseToBeReleased,
-      data.dischargeParameters,
-      data.substrate,
-      data.weather,
-      data.dispersionParameters,
-      data.dispersionParameterCount,
-      data.endPointConcentration,
-      data.flammableParameters,
-      data.explosionParameters,
-      data.dispersionFlamOutputConfigs,
-      data.dispersionFlamOutputConfigCount,
-      data.dispersionToxicOutputConfigs,
-      data.dispersionToxicOutputConfigCount,
-      data.flammableOutputConfigs,
-      data.flammableOutputConfigCount,
-      data.explosionOutputConfigs,
-      data.explosionOutputConfigCount,
-      data.explosionConfinedVolumes,
-      data.explosionConfinedVolumeCount
-    );
+  makeCalculationRequest(data: BESSLinkedRunnerCalculationRequestSchemaData): BESSLinkedRunnerCalculationRequest {
+    return new BESSLinkedRunnerCalculationRequest(data);
   }
 }
 
-export class UserDefinedSourceLinkedRunCalculation extends CalculationBase {
-  material: Entities.Material;
-  dischargeResult: Entities.DischargeResult;
-  dischargeRecords: Entities.DischargeRecord[];
-  dischargeRecordCount: number;
-  phaseToBeReleased: Enums.Phase;
-  dischargeParameters: Entities.DischargeParameters;
-  substrate: Entities.Substrate;
+export class BESSLinkedRunnerCalculation extends CalculationBase {
+  bessUnit: Entities.BESSUnit;
+  bessRelease: Entities.BESSRelease;
   weather: Entities.Weather;
+  substrate: Entities.Substrate;
   dispersionParameters: Entities.DispersionParameters[];
   dispersionParameterCount: number;
   endPointConcentration: number;
@@ -405,6 +333,8 @@ export class UserDefinedSourceLinkedRunCalculation extends CalculationBase {
   explosionOutputConfigCount: number;
   explosionConfinedVolumes: Entities.ExplosionConfinedVolume[];
   explosionConfinedVolumeCount: number;
+  exitMaterial?: Entities.Material;
+  dischargeRecord?: Entities.DischargeRecord;
   distancesToJetFireRadiation?: number[];
   jetContourPoints?: Entities.LocalPosition[];
   nJetContourPoints?: number[];
@@ -428,41 +358,14 @@ export class UserDefinedSourceLinkedRunCalculation extends CalculationBase {
   poolFireFlameResult?: Entities.PoolFireFlameResult;
 
   /**
-   *  Calculates maximum distance to a number of concentration, radiation and overpressure levels for flammable and toxic materials, given the discharge inputs and weather definition.
+   *  Calculates maximum distance to a number of concentration levels for  toxic materials, given a BESS unit, BESS release and weather definition.
    *
-   * @param {Entities.Material} material -  a material entity.
-   * @param {Entities.DischargeResult} dischargeResult - Scalar discharge data.
-   * @param {Entities.DischargeRecord[]} dischargeRecords -  an array of discharge records.
-   * @param {number} dischargeRecordCount - Number of discharge records.
-   * @param {Enums.Phase} phaseToBeReleased - Phase to be released ( vapour, two-phase or liquid).
-   * @param {Entities.DischargeParameters} dischargeParameters -  a discharge parameters entity.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionParameters[]} dispersionParameters -  an array of dispersion parameters.
-   * @param {number} dispersionParameterCount - Number of dispersion parameters.
-   * @param {number} endPointConcentration - Concentration at which the dispersion calculations will terminate (v/v fraction).
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.ExplosionParameters} explosionParameters -  an explosion parameters entity.
-   * @param {Entities.DispersionOutputConfig[]} dispersionFlamOutputConfigs -  an array of dispersion output configs for flammable concentrations of interest.
-   * @param {number} dispersionFlamOutputConfigCount - Number of dispersion output configs for flammable concentrations of interest.
-   * @param {Entities.DispersionOutputConfig[]} dispersionToxicOutputConfigs -  an array of dispersion output configs for toxic concentrations of interest.
-   * @param {number} dispersionToxicOutputConfigCount - Number of dispersion output configs for toxic concentrations of interest.
-   * @param {Entities.FlammableOutputConfig[]} flammableOutputConfigs -  an array of flammable output configs for radiation levels of interest.
-   * @param {number} flammableOutputConfigCount - Number of flammable ouput configs for radiation levels of interest.
-   * @param {Entities.ExplosionOutputConfig[]} explosionOutputConfigs -  an array of explosion output configs for overpressure levels of interest.
-   * @param {number} explosionOutputConfigCount - Number of explosion output configs for overpressure levels of interest.
-   * @param {Entities.ExplosionConfinedVolume[]} explosionConfinedVolumes -  an array of explosion confined volumes.
-   * @param {number} explosionConfinedVolumeCount - Number of explosion confined volumes.
    */
-  constructor(
-    material: Entities.Material,
-    dischargeResult: Entities.DischargeResult,
-    dischargeRecords: Entities.DischargeRecord[],
-    dischargeRecordCount: number,
-    phaseToBeReleased: Enums.Phase,
-    dischargeParameters: Entities.DischargeParameters,
-    substrate: Entities.Substrate,
+  constructor(data: {
+    bessUnit: Entities.BESSUnit,
+    bessRelease: Entities.BESSRelease,
     weather: Entities.Weather,
+    substrate: Entities.Substrate,
     dispersionParameters: Entities.DispersionParameters[],
     dispersionParameterCount: number,
     endPointConcentration: number,
@@ -478,77 +381,72 @@ export class UserDefinedSourceLinkedRunCalculation extends CalculationBase {
     explosionOutputConfigCount: number,
     explosionConfinedVolumes: Entities.ExplosionConfinedVolume[],
     explosionConfinedVolumeCount: number
-  ) {
-    super();
-    this.material = material;
-    this.dischargeResult = dischargeResult;
-    this.dischargeRecords = dischargeRecords;
-    this.dischargeRecordCount = dischargeRecordCount;
-    this.phaseToBeReleased = phaseToBeReleased;
-    this.dischargeParameters = dischargeParameters;
-    this.substrate = substrate;
-    this.weather = weather;
-    this.dispersionParameters = dispersionParameters;
-    this.dispersionParameterCount = dispersionParameterCount;
-    this.endPointConcentration = endPointConcentration;
-    this.flammableParameters = flammableParameters;
-    this.explosionParameters = explosionParameters;
-    this.dispersionFlamOutputConfigs = dispersionFlamOutputConfigs;
-    this.dispersionFlamOutputConfigCount = dispersionFlamOutputConfigCount;
-    this.dispersionToxicOutputConfigs = dispersionToxicOutputConfigs;
-    this.dispersionToxicOutputConfigCount = dispersionToxicOutputConfigCount;
-    this.flammableOutputConfigs = flammableOutputConfigs;
-    this.flammableOutputConfigCount = flammableOutputConfigCount;
-    this.explosionOutputConfigs = explosionOutputConfigs;
-    this.explosionOutputConfigCount = explosionOutputConfigCount;
-    this.explosionConfinedVolumes = explosionConfinedVolumes;
-    this.explosionConfinedVolumeCount = explosionConfinedVolumeCount;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.bessUnit = data.bessUnit;
+    this.bessRelease = data.bessRelease;
+    this.weather = data.weather;
+    this.substrate = data.substrate;
+    this.dispersionParameters = data.dispersionParameters;
+    this.dispersionParameterCount = data.dispersionParameterCount;
+    this.endPointConcentration = data.endPointConcentration;
+    this.flammableParameters = data.flammableParameters;
+    this.explosionParameters = data.explosionParameters;
+    this.dispersionFlamOutputConfigs = data.dispersionFlamOutputConfigs;
+    this.dispersionFlamOutputConfigCount = data.dispersionFlamOutputConfigCount;
+    this.dispersionToxicOutputConfigs = data.dispersionToxicOutputConfigs;
+    this.dispersionToxicOutputConfigCount = data.dispersionToxicOutputConfigCount;
+    this.flammableOutputConfigs = data.flammableOutputConfigs;
+    this.flammableOutputConfigCount = data.flammableOutputConfigCount;
+    this.explosionOutputConfigs = data.explosionOutputConfigs;
+    this.explosionOutputConfigCount = data.explosionOutputConfigCount;
+    this.explosionConfinedVolumes = data.explosionConfinedVolumes;
+    this.explosionConfinedVolumeCount = data.explosionConfinedVolumeCount;
   }
 
   async run() {
     try {
-      const request = new UserDefinedSourceLinkedRunCalculationRequest(
-        this.material,
-        this.dischargeResult,
-        this.dischargeRecords,
-        this.dischargeRecordCount,
-        this.phaseToBeReleased,
-        this.dischargeParameters,
-        this.substrate,
-        this.weather,
-        this.dispersionParameters,
-        this.dispersionParameterCount,
-        this.endPointConcentration,
-        this.flammableParameters,
-        this.explosionParameters,
-        this.dispersionFlamOutputConfigs,
-        this.dispersionFlamOutputConfigCount,
-        this.dispersionToxicOutputConfigs,
-        this.dispersionToxicOutputConfigCount,
-        this.flammableOutputConfigs,
-        this.flammableOutputConfigCount,
-        this.explosionOutputConfigs,
-        this.explosionOutputConfigCount,
-        this.explosionConfinedVolumes,
-        this.explosionConfinedVolumeCount
-      );
+      const request = new BESSLinkedRunnerCalculationRequest({
+        bessUnit: this.bessUnit,
+        bessRelease: this.bessRelease,
+        weather: this.weather,
+        substrate: this.substrate,
+        dispersionParameters: this.dispersionParameters,
+        dispersionParameterCount: this.dispersionParameterCount,
+        endPointConcentration: this.endPointConcentration,
+        flammableParameters: this.flammableParameters,
+        explosionParameters: this.explosionParameters,
+        dispersionFlamOutputConfigs: this.dispersionFlamOutputConfigs,
+        dispersionFlamOutputConfigCount: this.dispersionFlamOutputConfigCount,
+        dispersionToxicOutputConfigs: this.dispersionToxicOutputConfigs,
+        dispersionToxicOutputConfigCount: this.dispersionToxicOutputConfigCount,
+        flammableOutputConfigs: this.flammableOutputConfigs,
+        flammableOutputConfigCount: this.flammableOutputConfigCount,
+        explosionOutputConfigs: this.explosionOutputConfigs,
+        explosionOutputConfigCount: this.explosionOutputConfigCount,
+        explosionConfinedVolumes: this.explosionConfinedVolumes,
+        explosionConfinedVolumeCount: this.explosionConfinedVolumeCount
+      });
 
-      const schema = new UserDefinedSourceLinkedRunCalculationRequestSchema();
+      const schema = new BESSLinkedRunnerCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
 
       const requestJson = JSON.stringify(validatedRequest);
-      const url = `${getAnalyticsApiTarget()}userdefinedsourcelinkedrun?clientId=${getClientAliasId()}`;
+      const url = `${getAnalyticsApiTarget()}batteryhazardlinkedrun?clientId=${getClientAliasId()}`;
 
       this.resultCode = Enums.ResultCode.UNEXPECTED_APPLICATION_ERROR;
 
       const { data } = await this.postRequest(url, requestJson);
 
-      const responseSchema = new UserDefinedSourceLinkedRunCalculationResponseSchema();
+      const responseSchema = new BESSLinkedRunnerCalculationResponseSchema();
       const validatedResponse = responseSchema.validate(data);
 
       this.resultCode = validatedResponse.resultCode;
       if (this.resultCode === Enums.ResultCode.SUCCESS) {
         Object.assign(this, {
+          exitMaterial: validatedResponse.exitMaterial,
+          dischargeRecord: validatedResponse.dischargeRecord,
           distancesToJetFireRadiation: validatedResponse.distancesToJetFireRadiation,
           jetContourPoints: validatedResponse.jetContourPoints,
           nJetContourPoints: validatedResponse.nJetContourPoints,
@@ -591,8 +489,10 @@ export class UserDefinedSourceLinkedRunCalculation extends CalculationBase {
   }
 
   toString() {
-    const parts = ["* UserDefinedSourceLinkedRun"];
+    const parts = ["* BESSLinkedRunner"];
 
+    parts.push(`exitMaterial: ${String(this.exitMaterial)}`);
+    parts.push(`dischargeRecord: ${String(this.dischargeRecord)}`);
     parts.push("*** distancesToJetFireRadiation:");
     parts.push(
       this.distancesToJetFireRadiation && this.distancesToJetFireRadiation.length > 0
@@ -719,7 +619,9 @@ export class UserDefinedSourceLinkedRunCalculation extends CalculationBase {
   }
 }
 
-export class UserDefinedSourceLinkedRunCalculationResponse extends CalculationResponseBase {
+export class BESSLinkedRunnerCalculationResponse extends CalculationResponseBase {
+  exitMaterial: Entities.Material;
+  dischargeRecord: Entities.DischargeRecord;
   distancesToJetFireRadiation: number[];
   jetContourPoints: Entities.LocalPosition[];
   nJetContourPoints: number[];
@@ -743,31 +645,12 @@ export class UserDefinedSourceLinkedRunCalculationResponse extends CalculationRe
   poolFireFlameResult: Entities.PoolFireFlameResult;
 
   /**
-   * UserDefinedSourceLinkedRun calculation response class.
+   * BESSLinkedRunner calculation response class.
    *
-   * @param {number[]} distancesToJetFireRadiation -  an array of distances to jet fire radiation levels, ordered according to the flammable output configs.
-   * @param {Entities.LocalPosition[]} jetContourPoints -  an array of jet fire radiation contour points, ordered according to the flammable output configs.
-   * @param {number[]} nJetContourPoints -  an array of the number of jet fire radiation contour points, ordered according to the flammable output configs.
-   * @param {number[]} areaContourJet -  an array of areas of the jet fire contours, ordered according to the flammable output configs.
-   * @param {number[]} distancesToFlamConcentration -  an array of distances to flammable concentration levels, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {number[]} flamConcentrationsUsed -  an array of flammable concentration levels used in the calculations, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {Entities.LocalPosition[]} flamConcContourPoints -  an array of maximum flammable concentration footprint contour points, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {number[]} nFlamConcContourPoints -  an array of the number of maximum flammable concentration footprint contour points, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {number[]} areaFootprintFlamConc -  an array of areas of the maximum flammable concentration footprint contours, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {number[]} distancesToPoolFireRadiation -  an array of distances to pool fire radiation levels, ordered according to the flammable output configs.
-   * @param {Entities.LocalPosition[]} poolContourPoints -  an array of pool fire radiation contour points, ordered according to the flammable output configs.
-   * @param {number[]} nPoolContourPoints -  an array of the number of pool fire radiation contour points, ordered according to the flammable output configs.
-   * @param {number[]} areaContourPool -  an array of areas of the pool fire contours, ordered according to the flammable output configs.
-   * @param {Entities.ExplosionOverpressureResult[]} explosionOverpressureResults -  an array of explosion overpressure results, ordered according to the explosion output configs.
-   * @param {number[]} distancesToToxicConcentration -  an array of distances to toxic concentration levels, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {number[]} toxicConcentrationUsed -  an array of toxic concentration levels used in the calculations, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {Entities.LocalPosition[]} toxicConcContourPoints -  an array of maximum toxic concentration footprint contour points, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {number[]} nToxicConcContourPoints -  an array of the number of maximum toxic concentration footprint contour points, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {number[]} areaFootprintToxicConc -  an array of areas of the maximum toxic concentration footprint contours, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {Entities.FlameResult} jetFireFlameResult -  a flame results entity, for jet fire.
-   * @param {Entities.PoolFireFlameResult} poolFireFlameResult -  a pool fire flame results entity, for pool fire.
    */
-  constructor(
+  constructor(data: {
+    exitMaterial: Entities.Material,
+    dischargeRecord: Entities.DischargeRecord,
     distancesToJetFireRadiation: number[],
     jetContourPoints: Entities.LocalPosition[],
     nJetContourPoints: number[],
@@ -793,36 +676,46 @@ export class UserDefinedSourceLinkedRunCalculationResponse extends CalculationRe
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.distancesToJetFireRadiation = distancesToJetFireRadiation;
-    this.jetContourPoints = jetContourPoints;
-    this.nJetContourPoints = nJetContourPoints;
-    this.areaContourJet = areaContourJet;
-    this.distancesToFlamConcentration = distancesToFlamConcentration;
-    this.flamConcentrationsUsed = flamConcentrationsUsed;
-    this.flamConcContourPoints = flamConcContourPoints;
-    this.nFlamConcContourPoints = nFlamConcContourPoints;
-    this.areaFootprintFlamConc = areaFootprintFlamConc;
-    this.distancesToPoolFireRadiation = distancesToPoolFireRadiation;
-    this.poolContourPoints = poolContourPoints;
-    this.nPoolContourPoints = nPoolContourPoints;
-    this.areaContourPool = areaContourPool;
-    this.explosionOverpressureResults = explosionOverpressureResults;
-    this.distancesToToxicConcentration = distancesToToxicConcentration;
-    this.toxicConcentrationUsed = toxicConcentrationUsed;
-    this.toxicConcContourPoints = toxicConcContourPoints;
-    this.nToxicConcContourPoints = nToxicConcContourPoints;
-    this.areaFootprintToxicConc = areaFootprintToxicConc;
-    this.jetFireFlameResult = jetFireFlameResult;
-    this.poolFireFlameResult = poolFireFlameResult;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.exitMaterial = data.exitMaterial;
+    this.dischargeRecord = data.dischargeRecord;
+    this.distancesToJetFireRadiation = data.distancesToJetFireRadiation;
+    this.jetContourPoints = data.jetContourPoints;
+    this.nJetContourPoints = data.nJetContourPoints;
+    this.areaContourJet = data.areaContourJet;
+    this.distancesToFlamConcentration = data.distancesToFlamConcentration;
+    this.flamConcentrationsUsed = data.flamConcentrationsUsed;
+    this.flamConcContourPoints = data.flamConcContourPoints;
+    this.nFlamConcContourPoints = data.nFlamConcContourPoints;
+    this.areaFootprintFlamConc = data.areaFootprintFlamConc;
+    this.distancesToPoolFireRadiation = data.distancesToPoolFireRadiation;
+    this.poolContourPoints = data.poolContourPoints;
+    this.nPoolContourPoints = data.nPoolContourPoints;
+    this.areaContourPool = data.areaContourPool;
+    this.explosionOverpressureResults = data.explosionOverpressureResults;
+    this.distancesToToxicConcentration = data.distancesToToxicConcentration;
+    this.toxicConcentrationUsed = data.toxicConcentrationUsed;
+    this.toxicConcContourPoints = data.toxicConcContourPoints;
+    this.nToxicConcContourPoints = data.nToxicConcContourPoints;
+    this.areaFootprintToxicConc = data.areaFootprintToxicConc;
+    this.jetFireFlameResult = data.jetFireFlameResult;
+    this.poolFireFlameResult = data.poolFireFlameResult;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
+    if (data.exitMaterial) {
+      this.exitMaterial = new Entities.Material();
+      this.exitMaterial.initialiseFromDictionary(data.exitMaterial as { [key: string]: unknown });
+    }
+    if (data.dischargeRecord) {
+      this.dischargeRecord = new Entities.DischargeRecord();
+      this.dischargeRecord.initialiseFromDictionary(data.dischargeRecord as { [key: string]: unknown });
+    }
     if (data.distancesToJetFireRadiation && Array.isArray(data.distancesToJetFireRadiation)) {
       this.distancesToJetFireRadiation = data.distancesToJetFireRadiation.map((item) => parseFloat(item));
     }
@@ -934,7 +827,9 @@ export class UserDefinedSourceLinkedRunCalculationResponse extends CalculationRe
   }
 }
 
-export interface UserDefinedSourceLinkedRunCalculationResponseSchemaData {
+export interface BESSLinkedRunnerCalculationResponseSchemaData {
+  exitMaterial: Entities.Material;
+  dischargeRecord: Entities.DischargeRecord;
   distancesToJetFireRadiation: number[];
   jetContourPoints: Entities.LocalPosition[];
   nJetContourPoints: number[];
@@ -962,15 +857,17 @@ export interface UserDefinedSourceLinkedRunCalculationResponseSchemaData {
   operationId: string;
 }
 
-export class UserDefinedSourceLinkedRunCalculationResponseSchema {
+export class BESSLinkedRunnerCalculationResponseSchema {
   schema: Joi.ObjectSchema;
   propertyTypes: Record<string, string>;
 
   /**
-   * Schema for the UserDefinedSourceLinkedRun calculation response.
+   * Schema for the BESSLinkedRunner calculation response.
    */
   constructor() {
     this.schema = Joi.object({
+      exitMaterial: new EntitySchemas.MaterialSchema().schema,
+      dischargeRecord: new EntitySchemas.DischargeRecordSchema().schema,
       distancesToJetFireRadiation: Joi.array().items(Joi.number().unsafe()).allow(null),
       jetContourPoints: Joi.array().items(new EntitySchemas.LocalPositionSchema().schema).allow(null),
       nJetContourPoints: Joi.array().items(Joi.number().integer()).allow(null),
@@ -999,6 +896,8 @@ export class UserDefinedSourceLinkedRunCalculationResponseSchema {
     }).unknown(true);
 
     this.propertyTypes = {
+      exitMaterial: "Entities.Material",
+      dischargeRecord: "Entities.DischargeRecord",
       distancesToJetFireRadiation: "number[]",
       jetContourPoints: "Entities.LocalPosition[]",
       nJetContourPoints: "number[]",
@@ -1023,7 +922,7 @@ export class UserDefinedSourceLinkedRunCalculationResponseSchema {
     };
   }
 
-  validate(data: UserDefinedSourceLinkedRunCalculationResponseSchemaData): UserDefinedSourceLinkedRunCalculationResponse {
+  validate(data: BESSLinkedRunnerCalculationResponseSchemaData): BESSLinkedRunnerCalculationResponse {
     const { error, value } = this.schema.validate(data, { abortEarly: false });
     if (error) {
       throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
@@ -1031,40 +930,17 @@ export class UserDefinedSourceLinkedRunCalculationResponseSchema {
     return this.makeCalculationResponse(value);
   }
 
-  makeCalculationResponse(data: UserDefinedSourceLinkedRunCalculationResponseSchemaData): UserDefinedSourceLinkedRunCalculationResponse {
-    return new UserDefinedSourceLinkedRunCalculationResponse(
-      data.distancesToJetFireRadiation,
-      data.jetContourPoints,
-      data.nJetContourPoints,
-      data.areaContourJet,
-      data.distancesToFlamConcentration,
-      data.flamConcentrationsUsed,
-      data.flamConcContourPoints,
-      data.nFlamConcContourPoints,
-      data.areaFootprintFlamConc,
-      data.distancesToPoolFireRadiation,
-      data.poolContourPoints,
-      data.nPoolContourPoints,
-      data.areaContourPool,
-      data.explosionOverpressureResults,
-      data.distancesToToxicConcentration,
-      data.toxicConcentrationUsed,
-      data.toxicConcContourPoints,
-      data.nToxicConcContourPoints,
-      data.areaFootprintToxicConc,
-      data.jetFireFlameResult,
-      data.poolFireFlameResult,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+  makeCalculationResponse(data: BESSLinkedRunnerCalculationResponseSchemaData): BESSLinkedRunnerCalculationResponse {
+    return new BESSLinkedRunnerCalculationResponse(data);
   }
 }
 
-export interface VesselLeakLinkedRunCalculationRequestSchemaData {
-  vessel: Entities.Vessel;
-  leak: Entities.Leak;
+export interface UserDefinedSourceLinkedRunCalculationRequestSchemaData {
+  material: Entities.Material;
+  dischargeResult: Entities.DischargeResult;
+  dischargeRecords: Entities.DischargeRecord[];
+  dischargeRecordCount: number;
+  phaseToBeReleased: Enums.Phase;
   dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
   weather: Entities.Weather;
@@ -1085,9 +961,12 @@ export interface VesselLeakLinkedRunCalculationRequestSchemaData {
   explosionConfinedVolumeCount: number;
 }
 
-class VesselLeakLinkedRunCalculationRequest extends CalculationRequestBase {
-  vessel: Entities.Vessel;
-  leak: Entities.Leak;
+class UserDefinedSourceLinkedRunCalculationRequest extends CalculationRequestBase {
+  material: Entities.Material;
+  dischargeResult: Entities.DischargeResult;
+  dischargeRecords: Entities.DischargeRecord[];
+  dischargeRecordCount: number;
+  phaseToBeReleased: Enums.Phase;
   dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
   weather: Entities.Weather;
@@ -1108,32 +987,15 @@ class VesselLeakLinkedRunCalculationRequest extends CalculationRequestBase {
   explosionConfinedVolumeCount: number;
 
   /**
-   * VesselLeakLinkedRun calculation request class.
+   * UserDefinedSourceLinkedRun calculation request class.
    *
-   * @param {Entities.Vessel} vessel -  a vessel entity.
-   * @param {Entities.Leak} leak -  a leak entity.
-   * @param {Entities.DischargeParameters} dischargeParameters -  a discharge parameters entity.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionParameters[]} dispersionParameters -  an array of dispersion parameters.
-   * @param {number} dispersionParameterCount - Number of dispersion parameters.
-   * @param {number} endPointConcentration - Concentration at which the dispersion calculations will terminate (v/v fraction).
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.ExplosionParameters} explosionParameters -  an explosion parameters entity.
-   * @param {Entities.DispersionOutputConfig[]} dispersionFlamOutputConfigs -  an array of dispersion output configs for flammable concentrations of interest.
-   * @param {number} dispersionFlamOutputConfigCount - Number of dispersion output configs for flammable concentrations of interest.
-   * @param {Entities.DispersionOutputConfig[]} dispersionToxicOutputConfigs -  an array of dispersion output configs for toxic concentrations of interest.
-   * @param {number} dispersionToxicOutputConfigCount - Number of dispersion output configs for toxic concentrations of interest.
-   * @param {Entities.FlammableOutputConfig[]} flammableOutputConfigs -  an array of flammable output configs for radiation levels of interest.
-   * @param {number} flammableOutputConfigCount - Number of flammable ouput configs for radiation levels of interest.
-   * @param {Entities.ExplosionOutputConfig[]} explosionOutputConfigs -  an array of explosion output configs for overpressure levels of interest.
-   * @param {number} explosionOutputConfigCount - Number of explosion output configs for overpressure levels of interest.
-   * @param {Entities.ExplosionConfinedVolume[]} explosionConfinedVolumes -  an array of explosion confined volumes.
-   * @param {number} explosionConfinedVolumeCount - Number of explosion confined volumes.
    */
-  constructor(
-    vessel: Entities.Vessel,
-    leak: Entities.Leak,
+  constructor(data: {
+    material: Entities.Material,
+    dischargeResult: Entities.DischargeResult,
+    dischargeRecords: Entities.DischargeRecord[],
+    dischargeRecordCount: number,
+    phaseToBeReleased: Enums.Phase,
     dischargeParameters: Entities.DischargeParameters,
     substrate: Entities.Substrate,
     weather: Entities.Weather,
@@ -1152,42 +1014,48 @@ class VesselLeakLinkedRunCalculationRequest extends CalculationRequestBase {
     explosionOutputConfigCount: number,
     explosionConfinedVolumes: Entities.ExplosionConfinedVolume[],
     explosionConfinedVolumeCount: number
-  ) {
+  }) {
     super();
-    this.vessel = vessel;
-    this.leak = leak;
-    this.dischargeParameters = dischargeParameters;
-    this.substrate = substrate;
-    this.weather = weather;
-    this.dispersionParameters = dispersionParameters;
-    this.dispersionParameterCount = dispersionParameterCount;
-    this.endPointConcentration = endPointConcentration;
-    this.flammableParameters = flammableParameters;
-    this.explosionParameters = explosionParameters;
-    this.dispersionFlamOutputConfigs = dispersionFlamOutputConfigs;
-    this.dispersionFlamOutputConfigCount = dispersionFlamOutputConfigCount;
-    this.dispersionToxicOutputConfigs = dispersionToxicOutputConfigs;
-    this.dispersionToxicOutputConfigCount = dispersionToxicOutputConfigCount;
-    this.flammableOutputConfigs = flammableOutputConfigs;
-    this.flammableOutputConfigCount = flammableOutputConfigCount;
-    this.explosionOutputConfigs = explosionOutputConfigs;
-    this.explosionOutputConfigCount = explosionOutputConfigCount;
-    this.explosionConfinedVolumes = explosionConfinedVolumes;
-    this.explosionConfinedVolumeCount = explosionConfinedVolumeCount;
+    this.material = data.material;
+    this.dischargeResult = data.dischargeResult;
+    this.dischargeRecords = data.dischargeRecords;
+    this.dischargeRecordCount = data.dischargeRecordCount;
+    this.phaseToBeReleased = data.phaseToBeReleased;
+    this.dischargeParameters = data.dischargeParameters;
+    this.substrate = data.substrate;
+    this.weather = data.weather;
+    this.dispersionParameters = data.dispersionParameters;
+    this.dispersionParameterCount = data.dispersionParameterCount;
+    this.endPointConcentration = data.endPointConcentration;
+    this.flammableParameters = data.flammableParameters;
+    this.explosionParameters = data.explosionParameters;
+    this.dispersionFlamOutputConfigs = data.dispersionFlamOutputConfigs;
+    this.dispersionFlamOutputConfigCount = data.dispersionFlamOutputConfigCount;
+    this.dispersionToxicOutputConfigs = data.dispersionToxicOutputConfigs;
+    this.dispersionToxicOutputConfigCount = data.dispersionToxicOutputConfigCount;
+    this.flammableOutputConfigs = data.flammableOutputConfigs;
+    this.flammableOutputConfigCount = data.flammableOutputConfigCount;
+    this.explosionOutputConfigs = data.explosionOutputConfigs;
+    this.explosionOutputConfigCount = data.explosionOutputConfigCount;
+    this.explosionConfinedVolumes = data.explosionConfinedVolumes;
+    this.explosionConfinedVolumeCount = data.explosionConfinedVolumeCount;
   }
 }
 
-export class VesselLeakLinkedRunCalculationRequestSchema {
+export class UserDefinedSourceLinkedRunCalculationRequestSchema {
   schema: Joi.ObjectSchema;
   propertyTypes: Record<string, string>;
 
   /**
-   * Schema for the VesselLeakLinkedRun calculation request.
+   * Schema for the UserDefinedSourceLinkedRun calculation request.
    */
   constructor() {
     this.schema = Joi.object({
-      vessel: new EntitySchemas.VesselSchema().schema,
-      leak: new EntitySchemas.LeakSchema().schema,
+      material: new EntitySchemas.MaterialSchema().schema,
+      dischargeResult: new EntitySchemas.DischargeResultSchema().schema,
+      dischargeRecords: Joi.array().items(new EntitySchemas.DischargeRecordSchema().schema).allow(null),
+      dischargeRecordCount: Joi.number().integer(),
+      phaseToBeReleased: Joi.string().valid(...Object.values(Enums.Phase)),
       dischargeParameters: new EntitySchemas.DischargeParametersSchema().schema,
       substrate: new EntitySchemas.SubstrateSchema().schema,
       weather: new EntitySchemas.WeatherSchema().schema,
@@ -1209,8 +1077,11 @@ export class VesselLeakLinkedRunCalculationRequestSchema {
     }).unknown(true);
 
     this.propertyTypes = {
-      vessel: "Entities.Vessel",
-      leak: "Entities.Leak",
+      material: "Entities.Material",
+      dischargeResult: "Entities.DischargeResult",
+      dischargeRecords: "Entities.DischargeRecord[]",
+      dischargeRecordCount: "number",
+      phaseToBeReleased: "Enums.Phase",
       dischargeParameters: "Entities.DischargeParameters",
       substrate: "Entities.Substrate",
       weather: "Entities.Weather",
@@ -1232,7 +1103,7 @@ export class VesselLeakLinkedRunCalculationRequestSchema {
     };
   }
 
-  validate(data: VesselLeakLinkedRunCalculationRequestSchemaData): VesselLeakLinkedRunCalculationRequest {
+  validate(data: UserDefinedSourceLinkedRunCalculationRequestSchemaData): UserDefinedSourceLinkedRunCalculationRequest {
     const { error, value } = this.schema.validate(data, { abortEarly: false });
     if (error) {
       throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
@@ -1240,35 +1111,17 @@ export class VesselLeakLinkedRunCalculationRequestSchema {
     return this.makeCalculationRequest(value);
   }
 
-  makeCalculationRequest(data: VesselLeakLinkedRunCalculationRequestSchemaData): VesselLeakLinkedRunCalculationRequest {
-    return new VesselLeakLinkedRunCalculationRequest(
-      data.vessel,
-      data.leak,
-      data.dischargeParameters,
-      data.substrate,
-      data.weather,
-      data.dispersionParameters,
-      data.dispersionParameterCount,
-      data.endPointConcentration,
-      data.flammableParameters,
-      data.explosionParameters,
-      data.dispersionFlamOutputConfigs,
-      data.dispersionFlamOutputConfigCount,
-      data.dispersionToxicOutputConfigs,
-      data.dispersionToxicOutputConfigCount,
-      data.flammableOutputConfigs,
-      data.flammableOutputConfigCount,
-      data.explosionOutputConfigs,
-      data.explosionOutputConfigCount,
-      data.explosionConfinedVolumes,
-      data.explosionConfinedVolumeCount
-    );
+  makeCalculationRequest(data: UserDefinedSourceLinkedRunCalculationRequestSchemaData): UserDefinedSourceLinkedRunCalculationRequest {
+    return new UserDefinedSourceLinkedRunCalculationRequest(data);
   }
 }
 
-export class VesselLeakLinkedRunCalculation extends CalculationBase {
-  vessel: Entities.Vessel;
-  leak: Entities.Leak;
+export class UserDefinedSourceLinkedRunCalculation extends CalculationBase {
+  material: Entities.Material;
+  dischargeResult: Entities.DischargeResult;
+  dischargeRecords: Entities.DischargeRecord[];
+  dischargeRecordCount: number;
+  phaseToBeReleased: Enums.Phase;
   dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
   weather: Entities.Weather;
@@ -1287,7 +1140,6 @@ export class VesselLeakLinkedRunCalculation extends CalculationBase {
   explosionOutputConfigCount: number;
   explosionConfinedVolumes: Entities.ExplosionConfinedVolume[];
   explosionConfinedVolumeCount: number;
-  dischargeRecord?: Entities.DischargeRecord;
   distancesToJetFireRadiation?: number[];
   jetContourPoints?: Entities.LocalPosition[];
   nJetContourPoints?: number[];
@@ -1311,32 +1163,15 @@ export class VesselLeakLinkedRunCalculation extends CalculationBase {
   poolFireFlameResult?: Entities.PoolFireFlameResult;
 
   /**
-   *  Calculates maximum distance to a number of concentration, radiation and overpressure levels for flammable and toxic materials, given a vessel, leak and weather definition.
+   *  Calculates maximum distance to a number of concentration, radiation and overpressure levels for flammable and toxic materials, given the discharge inputs and weather definition.
    *
-   * @param {Entities.Vessel} vessel -  a vessel entity.
-   * @param {Entities.Leak} leak -  a leak entity.
-   * @param {Entities.DischargeParameters} dischargeParameters -  a discharge parameters entity.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionParameters[]} dispersionParameters -  an array of dispersion parameters.
-   * @param {number} dispersionParameterCount - Number of dispersion parameters.
-   * @param {number} endPointConcentration - Concentration at which the dispersion calculations will terminate (v/v fraction).
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.ExplosionParameters} explosionParameters -  an explosion parameters entity.
-   * @param {Entities.DispersionOutputConfig[]} dispersionFlamOutputConfigs -  an array of dispersion output configs for flammable concentrations of interest.
-   * @param {number} dispersionFlamOutputConfigCount - Number of dispersion output configs for flammable concentrations of interest.
-   * @param {Entities.DispersionOutputConfig[]} dispersionToxicOutputConfigs -  an array of dispersion output configs for toxic concentrations of interest.
-   * @param {number} dispersionToxicOutputConfigCount - Number of dispersion output configs for toxic concentrations of interest.
-   * @param {Entities.FlammableOutputConfig[]} flammableOutputConfigs -  an array of flammable output configs for radiation levels of interest.
-   * @param {number} flammableOutputConfigCount - Number of flammable ouput configs for radiation levels of interest.
-   * @param {Entities.ExplosionOutputConfig[]} explosionOutputConfigs -  an array of explosion output configs for overpressure levels of interest.
-   * @param {number} explosionOutputConfigCount - Number of explosion output configs for overpressure levels of interest.
-   * @param {Entities.ExplosionConfinedVolume[]} explosionConfinedVolumes -  an array of explosion confined volumes.
-   * @param {number} explosionConfinedVolumeCount - Number of explosion confined volumes.
    */
-  constructor(
-    vessel: Entities.Vessel,
-    leak: Entities.Leak,
+  constructor(data: {
+    material: Entities.Material,
+    dischargeResult: Entities.DischargeResult,
+    dischargeRecords: Entities.DischargeRecord[],
+    dischargeRecordCount: number,
+    phaseToBeReleased: Enums.Phase,
     dischargeParameters: Entities.DischargeParameters,
     substrate: Entities.Substrate,
     weather: Entities.Weather,
@@ -1355,72 +1190,78 @@ export class VesselLeakLinkedRunCalculation extends CalculationBase {
     explosionOutputConfigCount: number,
     explosionConfinedVolumes: Entities.ExplosionConfinedVolume[],
     explosionConfinedVolumeCount: number
-  ) {
-    super();
-    this.vessel = vessel;
-    this.leak = leak;
-    this.dischargeParameters = dischargeParameters;
-    this.substrate = substrate;
-    this.weather = weather;
-    this.dispersionParameters = dispersionParameters;
-    this.dispersionParameterCount = dispersionParameterCount;
-    this.endPointConcentration = endPointConcentration;
-    this.flammableParameters = flammableParameters;
-    this.explosionParameters = explosionParameters;
-    this.dispersionFlamOutputConfigs = dispersionFlamOutputConfigs;
-    this.dispersionFlamOutputConfigCount = dispersionFlamOutputConfigCount;
-    this.dispersionToxicOutputConfigs = dispersionToxicOutputConfigs;
-    this.dispersionToxicOutputConfigCount = dispersionToxicOutputConfigCount;
-    this.flammableOutputConfigs = flammableOutputConfigs;
-    this.flammableOutputConfigCount = flammableOutputConfigCount;
-    this.explosionOutputConfigs = explosionOutputConfigs;
-    this.explosionOutputConfigCount = explosionOutputConfigCount;
-    this.explosionConfinedVolumes = explosionConfinedVolumes;
-    this.explosionConfinedVolumeCount = explosionConfinedVolumeCount;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.material = data.material;
+    this.dischargeResult = data.dischargeResult;
+    this.dischargeRecords = data.dischargeRecords;
+    this.dischargeRecordCount = data.dischargeRecordCount;
+    this.phaseToBeReleased = data.phaseToBeReleased;
+    this.dischargeParameters = data.dischargeParameters;
+    this.substrate = data.substrate;
+    this.weather = data.weather;
+    this.dispersionParameters = data.dispersionParameters;
+    this.dispersionParameterCount = data.dispersionParameterCount;
+    this.endPointConcentration = data.endPointConcentration;
+    this.flammableParameters = data.flammableParameters;
+    this.explosionParameters = data.explosionParameters;
+    this.dispersionFlamOutputConfigs = data.dispersionFlamOutputConfigs;
+    this.dispersionFlamOutputConfigCount = data.dispersionFlamOutputConfigCount;
+    this.dispersionToxicOutputConfigs = data.dispersionToxicOutputConfigs;
+    this.dispersionToxicOutputConfigCount = data.dispersionToxicOutputConfigCount;
+    this.flammableOutputConfigs = data.flammableOutputConfigs;
+    this.flammableOutputConfigCount = data.flammableOutputConfigCount;
+    this.explosionOutputConfigs = data.explosionOutputConfigs;
+    this.explosionOutputConfigCount = data.explosionOutputConfigCount;
+    this.explosionConfinedVolumes = data.explosionConfinedVolumes;
+    this.explosionConfinedVolumeCount = data.explosionConfinedVolumeCount;
   }
 
   async run() {
     try {
-      const request = new VesselLeakLinkedRunCalculationRequest(
-        this.vessel,
-        this.leak,
-        this.dischargeParameters,
-        this.substrate,
-        this.weather,
-        this.dispersionParameters,
-        this.dispersionParameterCount,
-        this.endPointConcentration,
-        this.flammableParameters,
-        this.explosionParameters,
-        this.dispersionFlamOutputConfigs,
-        this.dispersionFlamOutputConfigCount,
-        this.dispersionToxicOutputConfigs,
-        this.dispersionToxicOutputConfigCount,
-        this.flammableOutputConfigs,
-        this.flammableOutputConfigCount,
-        this.explosionOutputConfigs,
-        this.explosionOutputConfigCount,
-        this.explosionConfinedVolumes,
-        this.explosionConfinedVolumeCount
-      );
+      const request = new UserDefinedSourceLinkedRunCalculationRequest({
+        material: this.material,
+        dischargeResult: this.dischargeResult,
+        dischargeRecords: this.dischargeRecords,
+        dischargeRecordCount: this.dischargeRecordCount,
+        phaseToBeReleased: this.phaseToBeReleased,
+        dischargeParameters: this.dischargeParameters,
+        substrate: this.substrate,
+        weather: this.weather,
+        dispersionParameters: this.dispersionParameters,
+        dispersionParameterCount: this.dispersionParameterCount,
+        endPointConcentration: this.endPointConcentration,
+        flammableParameters: this.flammableParameters,
+        explosionParameters: this.explosionParameters,
+        dispersionFlamOutputConfigs: this.dispersionFlamOutputConfigs,
+        dispersionFlamOutputConfigCount: this.dispersionFlamOutputConfigCount,
+        dispersionToxicOutputConfigs: this.dispersionToxicOutputConfigs,
+        dispersionToxicOutputConfigCount: this.dispersionToxicOutputConfigCount,
+        flammableOutputConfigs: this.flammableOutputConfigs,
+        flammableOutputConfigCount: this.flammableOutputConfigCount,
+        explosionOutputConfigs: this.explosionOutputConfigs,
+        explosionOutputConfigCount: this.explosionOutputConfigCount,
+        explosionConfinedVolumes: this.explosionConfinedVolumes,
+        explosionConfinedVolumeCount: this.explosionConfinedVolumeCount
+      });
 
-      const schema = new VesselLeakLinkedRunCalculationRequestSchema();
+      const schema = new UserDefinedSourceLinkedRunCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
 
       const requestJson = JSON.stringify(validatedRequest);
-      const url = `${getAnalyticsApiTarget()}vesselleaklinkedrun?clientId=${getClientAliasId()}`;
+      const url = `${getAnalyticsApiTarget()}userdefinedsourcelinkedrun?clientId=${getClientAliasId()}`;
 
       this.resultCode = Enums.ResultCode.UNEXPECTED_APPLICATION_ERROR;
 
       const { data } = await this.postRequest(url, requestJson);
 
-      const responseSchema = new VesselLeakLinkedRunCalculationResponseSchema();
+      const responseSchema = new UserDefinedSourceLinkedRunCalculationResponseSchema();
       const validatedResponse = responseSchema.validate(data);
 
       this.resultCode = validatedResponse.resultCode;
       if (this.resultCode === Enums.ResultCode.SUCCESS) {
         Object.assign(this, {
-          dischargeRecord: validatedResponse.dischargeRecord,
           distancesToJetFireRadiation: validatedResponse.distancesToJetFireRadiation,
           jetContourPoints: validatedResponse.jetContourPoints,
           nJetContourPoints: validatedResponse.nJetContourPoints,
@@ -1463,9 +1304,8 @@ export class VesselLeakLinkedRunCalculation extends CalculationBase {
   }
 
   toString() {
-    const parts = ["* VesselLeakLinkedRun"];
+    const parts = ["* UserDefinedSourceLinkedRun"];
 
-    parts.push(`dischargeRecord: ${String(this.dischargeRecord)}`);
     parts.push("*** distancesToJetFireRadiation:");
     parts.push(
       this.distancesToJetFireRadiation && this.distancesToJetFireRadiation.length > 0
@@ -1592,8 +1432,7 @@ export class VesselLeakLinkedRunCalculation extends CalculationBase {
   }
 }
 
-export class VesselLeakLinkedRunCalculationResponse extends CalculationResponseBase {
-  dischargeRecord: Entities.DischargeRecord;
+export class UserDefinedSourceLinkedRunCalculationResponse extends CalculationResponseBase {
   distancesToJetFireRadiation: number[];
   jetContourPoints: Entities.LocalPosition[];
   nJetContourPoints: number[];
@@ -1617,33 +1456,10 @@ export class VesselLeakLinkedRunCalculationResponse extends CalculationResponseB
   poolFireFlameResult: Entities.PoolFireFlameResult;
 
   /**
-   * VesselLeakLinkedRun calculation response class.
+   * UserDefinedSourceLinkedRun calculation response class.
    *
-   * @param {Entities.DischargeRecord} dischargeRecord -  a discharge record entity.
-   * @param {number[]} distancesToJetFireRadiation -  an array of distances to jet fire radiation levels, ordered according to the flammable output configs.
-   * @param {Entities.LocalPosition[]} jetContourPoints -  an array of jet fire radiation contour points, ordered according to the flammable output configs.
-   * @param {number[]} nJetContourPoints -  an array of the number of jet fire radiation contour points, ordered according to the flammable output configs.
-   * @param {number[]} areaContourJet -  an array of areas of the jet fire contours, ordered according to the flammable output configs.
-   * @param {number[]} distancesToFlamConcentration -  an array of distances to flammable concentration levels, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {number[]} flamConcentrationsUsed -  an array of flammable concentration levels used in the calculations, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {Entities.LocalPosition[]} flamConcContourPoints -  an array of maximum flammable concentration footprint contour points, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {number[]} nFlamConcContourPoints -  an array of the number of maximum flammable concentration footprint contour points, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {number[]} areaFootprintFlamConc -  an array of areas of the maximum flammable concentration footprint contours, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {number[]} distancesToPoolFireRadiation -  an array of distances to pool fire radiation levels, ordered according to the flammable output configs.
-   * @param {Entities.LocalPosition[]} poolContourPoints -  an array of pool fire radiation contour points, ordered according to the flammable output configs.
-   * @param {number[]} nPoolContourPoints -  an array of the number of pool fire radiation contour points, ordered according to the flammable output configs.
-   * @param {number[]} areaContourPool -  an array of areas of the pool fire contours, ordered according to the flammable output configs.
-   * @param {Entities.ExplosionOverpressureResult[]} explosionOverpressureResults -  an array of explosion overpressure results, ordered according to the explosion output configs.
-   * @param {number[]} distancesToToxicConcentration -  an array of distances to toxic concentration levels, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {number[]} toxicConcentrationUsed -  an array of toxic concentration levels used in the calculations, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {Entities.LocalPosition[]} toxicConcContourPoints -  an array of maximum toxic concentration footprint contour points, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {number[]} nToxicConcContourPoints -  an array of the number of maximum toxic concentration footprint contour points, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {number[]} areaFootprintToxicConc -  an array of areas of the maximum toxic concentration footprint contours, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {Entities.FlameResult} jetFireFlameResult -  a flame results entity, for jet fire.
-   * @param {Entities.PoolFireFlameResult} poolFireFlameResult -  a pool fire flame results entity, for pool fire.
    */
-  constructor(
-    dischargeRecord: Entities.DischargeRecord,
+  constructor(data: {
     distancesToJetFireRadiation: number[],
     jetContourPoints: Entities.LocalPosition[],
     nJetContourPoints: number[],
@@ -1669,41 +1485,36 @@ export class VesselLeakLinkedRunCalculationResponse extends CalculationResponseB
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.dischargeRecord = dischargeRecord;
-    this.distancesToJetFireRadiation = distancesToJetFireRadiation;
-    this.jetContourPoints = jetContourPoints;
-    this.nJetContourPoints = nJetContourPoints;
-    this.areaContourJet = areaContourJet;
-    this.distancesToFlamConcentration = distancesToFlamConcentration;
-    this.flamConcentrationsUsed = flamConcentrationsUsed;
-    this.flamConcContourPoints = flamConcContourPoints;
-    this.nFlamConcContourPoints = nFlamConcContourPoints;
-    this.areaFootprintFlamConc = areaFootprintFlamConc;
-    this.distancesToPoolFireRadiation = distancesToPoolFireRadiation;
-    this.poolContourPoints = poolContourPoints;
-    this.nPoolContourPoints = nPoolContourPoints;
-    this.areaContourPool = areaContourPool;
-    this.explosionOverpressureResults = explosionOverpressureResults;
-    this.distancesToToxicConcentration = distancesToToxicConcentration;
-    this.toxicConcentrationUsed = toxicConcentrationUsed;
-    this.toxicConcContourPoints = toxicConcContourPoints;
-    this.nToxicConcContourPoints = nToxicConcContourPoints;
-    this.areaFootprintToxicConc = areaFootprintToxicConc;
-    this.jetFireFlameResult = jetFireFlameResult;
-    this.poolFireFlameResult = poolFireFlameResult;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.distancesToJetFireRadiation = data.distancesToJetFireRadiation;
+    this.jetContourPoints = data.jetContourPoints;
+    this.nJetContourPoints = data.nJetContourPoints;
+    this.areaContourJet = data.areaContourJet;
+    this.distancesToFlamConcentration = data.distancesToFlamConcentration;
+    this.flamConcentrationsUsed = data.flamConcentrationsUsed;
+    this.flamConcContourPoints = data.flamConcContourPoints;
+    this.nFlamConcContourPoints = data.nFlamConcContourPoints;
+    this.areaFootprintFlamConc = data.areaFootprintFlamConc;
+    this.distancesToPoolFireRadiation = data.distancesToPoolFireRadiation;
+    this.poolContourPoints = data.poolContourPoints;
+    this.nPoolContourPoints = data.nPoolContourPoints;
+    this.areaContourPool = data.areaContourPool;
+    this.explosionOverpressureResults = data.explosionOverpressureResults;
+    this.distancesToToxicConcentration = data.distancesToToxicConcentration;
+    this.toxicConcentrationUsed = data.toxicConcentrationUsed;
+    this.toxicConcContourPoints = data.toxicConcContourPoints;
+    this.nToxicConcContourPoints = data.nToxicConcContourPoints;
+    this.areaFootprintToxicConc = data.areaFootprintToxicConc;
+    this.jetFireFlameResult = data.jetFireFlameResult;
+    this.poolFireFlameResult = data.poolFireFlameResult;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
-    if (data.dischargeRecord) {
-      this.dischargeRecord = new Entities.DischargeRecord();
-      this.dischargeRecord.initialiseFromDictionary(data.dischargeRecord as { [key: string]: unknown });
-    }
     if (data.distancesToJetFireRadiation && Array.isArray(data.distancesToJetFireRadiation)) {
       this.distancesToJetFireRadiation = data.distancesToJetFireRadiation.map((item) => parseFloat(item));
     }
@@ -1815,8 +1626,7 @@ export class VesselLeakLinkedRunCalculationResponse extends CalculationResponseB
   }
 }
 
-export interface VesselLeakLinkedRunCalculationResponseSchemaData {
-  dischargeRecord: Entities.DischargeRecord;
+export interface UserDefinedSourceLinkedRunCalculationResponseSchemaData {
   distancesToJetFireRadiation: number[];
   jetContourPoints: Entities.LocalPosition[];
   nJetContourPoints: number[];
@@ -1844,16 +1654,15 @@ export interface VesselLeakLinkedRunCalculationResponseSchemaData {
   operationId: string;
 }
 
-export class VesselLeakLinkedRunCalculationResponseSchema {
+export class UserDefinedSourceLinkedRunCalculationResponseSchema {
   schema: Joi.ObjectSchema;
   propertyTypes: Record<string, string>;
 
   /**
-   * Schema for the VesselLeakLinkedRun calculation response.
+   * Schema for the UserDefinedSourceLinkedRun calculation response.
    */
   constructor() {
     this.schema = Joi.object({
-      dischargeRecord: new EntitySchemas.DischargeRecordSchema().schema,
       distancesToJetFireRadiation: Joi.array().items(Joi.number().unsafe()).allow(null),
       jetContourPoints: Joi.array().items(new EntitySchemas.LocalPositionSchema().schema).allow(null),
       nJetContourPoints: Joi.array().items(Joi.number().integer()).allow(null),
@@ -1882,7 +1691,6 @@ export class VesselLeakLinkedRunCalculationResponseSchema {
     }).unknown(true);
 
     this.propertyTypes = {
-      dischargeRecord: "Entities.DischargeRecord",
       distancesToJetFireRadiation: "number[]",
       jetContourPoints: "Entities.LocalPosition[]",
       nJetContourPoints: "number[]",
@@ -1907,7 +1715,7 @@ export class VesselLeakLinkedRunCalculationResponseSchema {
     };
   }
 
-  validate(data: VesselLeakLinkedRunCalculationResponseSchemaData): VesselLeakLinkedRunCalculationResponse {
+  validate(data: UserDefinedSourceLinkedRunCalculationResponseSchemaData): UserDefinedSourceLinkedRunCalculationResponse {
     const { error, value } = this.schema.validate(data, { abortEarly: false });
     if (error) {
       throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
@@ -1915,41 +1723,14 @@ export class VesselLeakLinkedRunCalculationResponseSchema {
     return this.makeCalculationResponse(value);
   }
 
-  makeCalculationResponse(data: VesselLeakLinkedRunCalculationResponseSchemaData): VesselLeakLinkedRunCalculationResponse {
-    return new VesselLeakLinkedRunCalculationResponse(
-      data.dischargeRecord,
-      data.distancesToJetFireRadiation,
-      data.jetContourPoints,
-      data.nJetContourPoints,
-      data.areaContourJet,
-      data.distancesToFlamConcentration,
-      data.flamConcentrationsUsed,
-      data.flamConcContourPoints,
-      data.nFlamConcContourPoints,
-      data.areaFootprintFlamConc,
-      data.distancesToPoolFireRadiation,
-      data.poolContourPoints,
-      data.nPoolContourPoints,
-      data.areaContourPool,
-      data.explosionOverpressureResults,
-      data.distancesToToxicConcentration,
-      data.toxicConcentrationUsed,
-      data.toxicConcContourPoints,
-      data.nToxicConcContourPoints,
-      data.areaFootprintToxicConc,
-      data.jetFireFlameResult,
-      data.poolFireFlameResult,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+  makeCalculationResponse(data: UserDefinedSourceLinkedRunCalculationResponseSchemaData): UserDefinedSourceLinkedRunCalculationResponse {
+    return new UserDefinedSourceLinkedRunCalculationResponse(data);
   }
 }
 
-export interface VesselLineRuptureLinkedRunCalculationRequestSchemaData {
+export interface VesselLeakLinkedRunCalculationRequestSchemaData {
   vessel: Entities.Vessel;
-  lineRupture: Entities.LineRupture;
+  leak: Entities.Leak;
   dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
   weather: Entities.Weather;
@@ -1970,9 +1751,9 @@ export interface VesselLineRuptureLinkedRunCalculationRequestSchemaData {
   explosionConfinedVolumeCount: number;
 }
 
-class VesselLineRuptureLinkedRunCalculationRequest extends CalculationRequestBase {
+class VesselLeakLinkedRunCalculationRequest extends CalculationRequestBase {
   vessel: Entities.Vessel;
-  lineRupture: Entities.LineRupture;
+  leak: Entities.Leak;
   dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
   weather: Entities.Weather;
@@ -1993,32 +1774,12 @@ class VesselLineRuptureLinkedRunCalculationRequest extends CalculationRequestBas
   explosionConfinedVolumeCount: number;
 
   /**
-   * VesselLineRuptureLinkedRun calculation request class.
+   * VesselLeakLinkedRun calculation request class.
    *
-   * @param {Entities.Vessel} vessel -  a vessel entity.
-   * @param {Entities.LineRupture} lineRupture -  a line rupture entity.
-   * @param {Entities.DischargeParameters} dischargeParameters -  a discharge parameters entity.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionParameters[]} dispersionParameters -  an array of dispersion parameters.
-   * @param {number} dispersionParameterCount - Number of dispersion parameters.
-   * @param {number} endPointConcentration - Concentration at which the dispersion calculations will terminate (v/v fraction).
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.ExplosionParameters} explosionParameters -  an explosion parameters entity.
-   * @param {Entities.DispersionOutputConfig[]} dispersionFlamOutputConfigs -  an array of dispersion output configs for flammable concentrations of interest.
-   * @param {number} dispersionFlamOutputConfigCount - Number of dispersion output configs for flammable concentrations of interest.
-   * @param {Entities.DispersionOutputConfig[]} dispersionToxicOutputConfigs -  an array of dispersion output configs for toxic concentrations of interest.
-   * @param {number} dispersionToxicOutputConfigCount - Number of dispersion output configs for toxic concentrations of interest.
-   * @param {Entities.FlammableOutputConfig[]} flammableOutputConfigs -  an array of flammable output configs for radiation levels of interest.
-   * @param {number} flammableOutputConfigCount - Number of flammable ouput configs for radiation levels of interest.
-   * @param {Entities.ExplosionOutputConfig[]} explosionOutputConfigs -  an array of explosion output configs for overpressure levels of interest.
-   * @param {number} explosionOutputConfigCount - Number of explosion output configs for overpressure levels of interest.
-   * @param {Entities.ExplosionConfinedVolume[]} explosionConfinedVolumes -  an array of explosion confined volumes.
-   * @param {number} explosionConfinedVolumeCount - Number of explosion confined volumes.
    */
-  constructor(
+  constructor(data: {
     vessel: Entities.Vessel,
-    lineRupture: Entities.LineRupture,
+    leak: Entities.Leak,
     dischargeParameters: Entities.DischargeParameters,
     substrate: Entities.Substrate,
     weather: Entities.Weather,
@@ -2037,42 +1798,42 @@ class VesselLineRuptureLinkedRunCalculationRequest extends CalculationRequestBas
     explosionOutputConfigCount: number,
     explosionConfinedVolumes: Entities.ExplosionConfinedVolume[],
     explosionConfinedVolumeCount: number
-  ) {
+  }) {
     super();
-    this.vessel = vessel;
-    this.lineRupture = lineRupture;
-    this.dischargeParameters = dischargeParameters;
-    this.substrate = substrate;
-    this.weather = weather;
-    this.dispersionParameters = dispersionParameters;
-    this.dispersionParameterCount = dispersionParameterCount;
-    this.endPointConcentration = endPointConcentration;
-    this.flammableParameters = flammableParameters;
-    this.explosionParameters = explosionParameters;
-    this.dispersionFlamOutputConfigs = dispersionFlamOutputConfigs;
-    this.dispersionFlamOutputConfigCount = dispersionFlamOutputConfigCount;
-    this.dispersionToxicOutputConfigs = dispersionToxicOutputConfigs;
-    this.dispersionToxicOutputConfigCount = dispersionToxicOutputConfigCount;
-    this.flammableOutputConfigs = flammableOutputConfigs;
-    this.flammableOutputConfigCount = flammableOutputConfigCount;
-    this.explosionOutputConfigs = explosionOutputConfigs;
-    this.explosionOutputConfigCount = explosionOutputConfigCount;
-    this.explosionConfinedVolumes = explosionConfinedVolumes;
-    this.explosionConfinedVolumeCount = explosionConfinedVolumeCount;
+    this.vessel = data.vessel;
+    this.leak = data.leak;
+    this.dischargeParameters = data.dischargeParameters;
+    this.substrate = data.substrate;
+    this.weather = data.weather;
+    this.dispersionParameters = data.dispersionParameters;
+    this.dispersionParameterCount = data.dispersionParameterCount;
+    this.endPointConcentration = data.endPointConcentration;
+    this.flammableParameters = data.flammableParameters;
+    this.explosionParameters = data.explosionParameters;
+    this.dispersionFlamOutputConfigs = data.dispersionFlamOutputConfigs;
+    this.dispersionFlamOutputConfigCount = data.dispersionFlamOutputConfigCount;
+    this.dispersionToxicOutputConfigs = data.dispersionToxicOutputConfigs;
+    this.dispersionToxicOutputConfigCount = data.dispersionToxicOutputConfigCount;
+    this.flammableOutputConfigs = data.flammableOutputConfigs;
+    this.flammableOutputConfigCount = data.flammableOutputConfigCount;
+    this.explosionOutputConfigs = data.explosionOutputConfigs;
+    this.explosionOutputConfigCount = data.explosionOutputConfigCount;
+    this.explosionConfinedVolumes = data.explosionConfinedVolumes;
+    this.explosionConfinedVolumeCount = data.explosionConfinedVolumeCount;
   }
 }
 
-export class VesselLineRuptureLinkedRunCalculationRequestSchema {
+export class VesselLeakLinkedRunCalculationRequestSchema {
   schema: Joi.ObjectSchema;
   propertyTypes: Record<string, string>;
 
   /**
-   * Schema for the VesselLineRuptureLinkedRun calculation request.
+   * Schema for the VesselLeakLinkedRun calculation request.
    */
   constructor() {
     this.schema = Joi.object({
       vessel: new EntitySchemas.VesselSchema().schema,
-      lineRupture: new EntitySchemas.LineRuptureSchema().schema,
+      leak: new EntitySchemas.LeakSchema().schema,
       dischargeParameters: new EntitySchemas.DischargeParametersSchema().schema,
       substrate: new EntitySchemas.SubstrateSchema().schema,
       weather: new EntitySchemas.WeatherSchema().schema,
@@ -2095,7 +1856,7 @@ export class VesselLineRuptureLinkedRunCalculationRequestSchema {
 
     this.propertyTypes = {
       vessel: "Entities.Vessel",
-      lineRupture: "Entities.LineRupture",
+      leak: "Entities.Leak",
       dischargeParameters: "Entities.DischargeParameters",
       substrate: "Entities.Substrate",
       weather: "Entities.Weather",
@@ -2117,7 +1878,7 @@ export class VesselLineRuptureLinkedRunCalculationRequestSchema {
     };
   }
 
-  validate(data: VesselLineRuptureLinkedRunCalculationRequestSchemaData): VesselLineRuptureLinkedRunCalculationRequest {
+  validate(data: VesselLeakLinkedRunCalculationRequestSchemaData): VesselLeakLinkedRunCalculationRequest {
     const { error, value } = this.schema.validate(data, { abortEarly: false });
     if (error) {
       throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
@@ -2125,35 +1886,14 @@ export class VesselLineRuptureLinkedRunCalculationRequestSchema {
     return this.makeCalculationRequest(value);
   }
 
-  makeCalculationRequest(data: VesselLineRuptureLinkedRunCalculationRequestSchemaData): VesselLineRuptureLinkedRunCalculationRequest {
-    return new VesselLineRuptureLinkedRunCalculationRequest(
-      data.vessel,
-      data.lineRupture,
-      data.dischargeParameters,
-      data.substrate,
-      data.weather,
-      data.dispersionParameters,
-      data.dispersionParameterCount,
-      data.endPointConcentration,
-      data.flammableParameters,
-      data.explosionParameters,
-      data.dispersionFlamOutputConfigs,
-      data.dispersionFlamOutputConfigCount,
-      data.dispersionToxicOutputConfigs,
-      data.dispersionToxicOutputConfigCount,
-      data.flammableOutputConfigs,
-      data.flammableOutputConfigCount,
-      data.explosionOutputConfigs,
-      data.explosionOutputConfigCount,
-      data.explosionConfinedVolumes,
-      data.explosionConfinedVolumeCount
-    );
+  makeCalculationRequest(data: VesselLeakLinkedRunCalculationRequestSchemaData): VesselLeakLinkedRunCalculationRequest {
+    return new VesselLeakLinkedRunCalculationRequest(data);
   }
 }
 
-export class VesselLineRuptureLinkedRunCalculation extends CalculationBase {
+export class VesselLeakLinkedRunCalculation extends CalculationBase {
   vessel: Entities.Vessel;
-  lineRupture: Entities.LineRupture;
+  leak: Entities.Leak;
   dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
   weather: Entities.Weather;
@@ -2196,32 +1936,12 @@ export class VesselLineRuptureLinkedRunCalculation extends CalculationBase {
   poolFireFlameResult?: Entities.PoolFireFlameResult;
 
   /**
-   *  Calculates maximum distance to a number of concentration, radiation and overpressure levels for flammable and toxic materials, given a vessel, line rupture and weather definition.
+   *  Calculates maximum distance to a number of concentration, radiation and overpressure levels for flammable and toxic materials, given a vessel, leak and weather definition.
    *
-   * @param {Entities.Vessel} vessel -  a vessel entity.
-   * @param {Entities.LineRupture} lineRupture -  a line rupture entity.
-   * @param {Entities.DischargeParameters} dischargeParameters -  a discharge parameters entity.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionParameters[]} dispersionParameters -  an array of dispersion parameters.
-   * @param {number} dispersionParameterCount - Number of dispersion parameters.
-   * @param {number} endPointConcentration - Concentration at which the dispersion calculations will terminate (v/v fraction).
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.ExplosionParameters} explosionParameters -  an explosion parameters entity.
-   * @param {Entities.DispersionOutputConfig[]} dispersionFlamOutputConfigs -  an array of dispersion output configs for flammable concentrations of interest.
-   * @param {number} dispersionFlamOutputConfigCount - Number of dispersion output configs for flammable concentrations of interest.
-   * @param {Entities.DispersionOutputConfig[]} dispersionToxicOutputConfigs -  an array of dispersion output configs for toxic concentrations of interest.
-   * @param {number} dispersionToxicOutputConfigCount - Number of dispersion output configs for toxic concentrations of interest.
-   * @param {Entities.FlammableOutputConfig[]} flammableOutputConfigs -  an array of flammable output configs for radiation levels of interest.
-   * @param {number} flammableOutputConfigCount - Number of flammable ouput configs for radiation levels of interest.
-   * @param {Entities.ExplosionOutputConfig[]} explosionOutputConfigs -  an array of explosion output configs for overpressure levels of interest.
-   * @param {number} explosionOutputConfigCount - Number of explosion output configs for overpressure levels of interest.
-   * @param {Entities.ExplosionConfinedVolume[]} explosionConfinedVolumes -  an array of explosion confined volumes.
-   * @param {number} explosionConfinedVolumeCount - Number of explosion confined volumes.
    */
-  constructor(
+  constructor(data: {
     vessel: Entities.Vessel,
-    lineRupture: Entities.LineRupture,
+    leak: Entities.Leak,
     dischargeParameters: Entities.DischargeParameters,
     substrate: Entities.Substrate,
     weather: Entities.Weather,
@@ -2240,66 +1960,67 @@ export class VesselLineRuptureLinkedRunCalculation extends CalculationBase {
     explosionOutputConfigCount: number,
     explosionConfinedVolumes: Entities.ExplosionConfinedVolume[],
     explosionConfinedVolumeCount: number
-  ) {
-    super();
-    this.vessel = vessel;
-    this.lineRupture = lineRupture;
-    this.dischargeParameters = dischargeParameters;
-    this.substrate = substrate;
-    this.weather = weather;
-    this.dispersionParameters = dispersionParameters;
-    this.dispersionParameterCount = dispersionParameterCount;
-    this.endPointConcentration = endPointConcentration;
-    this.flammableParameters = flammableParameters;
-    this.explosionParameters = explosionParameters;
-    this.dispersionFlamOutputConfigs = dispersionFlamOutputConfigs;
-    this.dispersionFlamOutputConfigCount = dispersionFlamOutputConfigCount;
-    this.dispersionToxicOutputConfigs = dispersionToxicOutputConfigs;
-    this.dispersionToxicOutputConfigCount = dispersionToxicOutputConfigCount;
-    this.flammableOutputConfigs = flammableOutputConfigs;
-    this.flammableOutputConfigCount = flammableOutputConfigCount;
-    this.explosionOutputConfigs = explosionOutputConfigs;
-    this.explosionOutputConfigCount = explosionOutputConfigCount;
-    this.explosionConfinedVolumes = explosionConfinedVolumes;
-    this.explosionConfinedVolumeCount = explosionConfinedVolumeCount;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.vessel = data.vessel;
+    this.leak = data.leak;
+    this.dischargeParameters = data.dischargeParameters;
+    this.substrate = data.substrate;
+    this.weather = data.weather;
+    this.dispersionParameters = data.dispersionParameters;
+    this.dispersionParameterCount = data.dispersionParameterCount;
+    this.endPointConcentration = data.endPointConcentration;
+    this.flammableParameters = data.flammableParameters;
+    this.explosionParameters = data.explosionParameters;
+    this.dispersionFlamOutputConfigs = data.dispersionFlamOutputConfigs;
+    this.dispersionFlamOutputConfigCount = data.dispersionFlamOutputConfigCount;
+    this.dispersionToxicOutputConfigs = data.dispersionToxicOutputConfigs;
+    this.dispersionToxicOutputConfigCount = data.dispersionToxicOutputConfigCount;
+    this.flammableOutputConfigs = data.flammableOutputConfigs;
+    this.flammableOutputConfigCount = data.flammableOutputConfigCount;
+    this.explosionOutputConfigs = data.explosionOutputConfigs;
+    this.explosionOutputConfigCount = data.explosionOutputConfigCount;
+    this.explosionConfinedVolumes = data.explosionConfinedVolumes;
+    this.explosionConfinedVolumeCount = data.explosionConfinedVolumeCount;
   }
 
   async run() {
     try {
-      const request = new VesselLineRuptureLinkedRunCalculationRequest(
-        this.vessel,
-        this.lineRupture,
-        this.dischargeParameters,
-        this.substrate,
-        this.weather,
-        this.dispersionParameters,
-        this.dispersionParameterCount,
-        this.endPointConcentration,
-        this.flammableParameters,
-        this.explosionParameters,
-        this.dispersionFlamOutputConfigs,
-        this.dispersionFlamOutputConfigCount,
-        this.dispersionToxicOutputConfigs,
-        this.dispersionToxicOutputConfigCount,
-        this.flammableOutputConfigs,
-        this.flammableOutputConfigCount,
-        this.explosionOutputConfigs,
-        this.explosionOutputConfigCount,
-        this.explosionConfinedVolumes,
-        this.explosionConfinedVolumeCount
-      );
+      const request = new VesselLeakLinkedRunCalculationRequest({
+        vessel: this.vessel,
+        leak: this.leak,
+        dischargeParameters: this.dischargeParameters,
+        substrate: this.substrate,
+        weather: this.weather,
+        dispersionParameters: this.dispersionParameters,
+        dispersionParameterCount: this.dispersionParameterCount,
+        endPointConcentration: this.endPointConcentration,
+        flammableParameters: this.flammableParameters,
+        explosionParameters: this.explosionParameters,
+        dispersionFlamOutputConfigs: this.dispersionFlamOutputConfigs,
+        dispersionFlamOutputConfigCount: this.dispersionFlamOutputConfigCount,
+        dispersionToxicOutputConfigs: this.dispersionToxicOutputConfigs,
+        dispersionToxicOutputConfigCount: this.dispersionToxicOutputConfigCount,
+        flammableOutputConfigs: this.flammableOutputConfigs,
+        flammableOutputConfigCount: this.flammableOutputConfigCount,
+        explosionOutputConfigs: this.explosionOutputConfigs,
+        explosionOutputConfigCount: this.explosionOutputConfigCount,
+        explosionConfinedVolumes: this.explosionConfinedVolumes,
+        explosionConfinedVolumeCount: this.explosionConfinedVolumeCount
+      });
 
-      const schema = new VesselLineRuptureLinkedRunCalculationRequestSchema();
+      const schema = new VesselLeakLinkedRunCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
 
       const requestJson = JSON.stringify(validatedRequest);
-      const url = `${getAnalyticsApiTarget()}vessellinerupturelinkedrun?clientId=${getClientAliasId()}`;
+      const url = `${getAnalyticsApiTarget()}vesselleaklinkedrun?clientId=${getClientAliasId()}`;
 
       this.resultCode = Enums.ResultCode.UNEXPECTED_APPLICATION_ERROR;
 
       const { data } = await this.postRequest(url, requestJson);
 
-      const responseSchema = new VesselLineRuptureLinkedRunCalculationResponseSchema();
+      const responseSchema = new VesselLeakLinkedRunCalculationResponseSchema();
       const validatedResponse = responseSchema.validate(data);
 
       this.resultCode = validatedResponse.resultCode;
@@ -2348,7 +2069,7 @@ export class VesselLineRuptureLinkedRunCalculation extends CalculationBase {
   }
 
   toString() {
-    const parts = ["* VesselLineRuptureLinkedRun"];
+    const parts = ["* VesselLeakLinkedRun"];
 
     parts.push(`dischargeRecord: ${String(this.dischargeRecord)}`);
     parts.push("*** distancesToJetFireRadiation:");
@@ -2477,7 +2198,7 @@ export class VesselLineRuptureLinkedRunCalculation extends CalculationBase {
   }
 }
 
-export class VesselLineRuptureLinkedRunCalculationResponse extends CalculationResponseBase {
+export class VesselLeakLinkedRunCalculationResponse extends CalculationResponseBase {
   dischargeRecord: Entities.DischargeRecord;
   distancesToJetFireRadiation: number[];
   jetContourPoints: Entities.LocalPosition[];
@@ -2502,32 +2223,10 @@ export class VesselLineRuptureLinkedRunCalculationResponse extends CalculationRe
   poolFireFlameResult: Entities.PoolFireFlameResult;
 
   /**
-   * VesselLineRuptureLinkedRun calculation response class.
+   * VesselLeakLinkedRun calculation response class.
    *
-   * @param {Entities.DischargeRecord} dischargeRecord -  a discharge record entity.
-   * @param {number[]} distancesToJetFireRadiation -  an array of distances to jet fire radiation levels, ordered according to the flammable output configs.
-   * @param {Entities.LocalPosition[]} jetContourPoints -  an array of jet fire radiation contour points, ordered according to the flammable output configs.
-   * @param {number[]} nJetContourPoints -  an array of the number of jet fire radiation contour points, ordered according to the flammable output configs.
-   * @param {number[]} areaContourJet -  an array of areas of the jet fire contours, ordered according to the flammable output configs.
-   * @param {number[]} distancesToFlamConcentration -  an array of distances to flammable concentration levels, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {number[]} flamConcentrationsUsed -  an array of flammable concentration levels used in the calculations, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {Entities.LocalPosition[]} flamConcContourPoints -  an array of maximum flammable concentration footprint contour points, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {number[]} nFlamConcContourPoints -  an array of the number of maximum flammable concentration footprint contour points, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {number[]} areaFootprintFlamConc -  an array of areas of the maximum flammable concentration footprint contours, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {number[]} distancesToPoolFireRadiation -  an array of distances to pool fire radiation levels, ordered according to the flammable output configs.
-   * @param {Entities.LocalPosition[]} poolContourPoints -  an array of pool fire radiation contour points, ordered according to the flammable output configs.
-   * @param {number[]} nPoolContourPoints -  an array of the number of pool fire radiation contour points, ordered according to the flammable output configs.
-   * @param {number[]} areaContourPool -  an array of areas of the pool fire contours, ordered according to the flammable output configs.
-   * @param {Entities.ExplosionOverpressureResult[]} explosionOverpressureResults -  an array of explosion overpressure results, ordered according to the explosion output configs.
-   * @param {number[]} distancesToToxicConcentration -  an array of distances to toxic concentration levels, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {number[]} toxicConcentrationUsed -  an array of toxic concentration levels used in the calculations, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {Entities.LocalPosition[]} toxicConcContourPoints -  an array of maximum toxic concentration footprint contour points, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {number[]} nToxicConcContourPoints -  an array of the number of maximum toxic concentration footprint contour points, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {number[]} areaFootprintToxicConc -  an array of areas of the maximum toxic concentration footprint contours, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {Entities.FlameResult} jetFireFlameResult -  a flame results entity, for jet fire.
-   * @param {Entities.PoolFireFlameResult} poolFireFlameResult -  a pool fire flame results entity, for pool fire.
    */
-  constructor(
+  constructor(data: {
     dischargeRecord: Entities.DischargeRecord,
     distancesToJetFireRadiation: number[],
     jetContourPoints: Entities.LocalPosition[],
@@ -2554,34 +2253,34 @@ export class VesselLineRuptureLinkedRunCalculationResponse extends CalculationRe
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.dischargeRecord = dischargeRecord;
-    this.distancesToJetFireRadiation = distancesToJetFireRadiation;
-    this.jetContourPoints = jetContourPoints;
-    this.nJetContourPoints = nJetContourPoints;
-    this.areaContourJet = areaContourJet;
-    this.distancesToFlamConcentration = distancesToFlamConcentration;
-    this.flamConcentrationsUsed = flamConcentrationsUsed;
-    this.flamConcContourPoints = flamConcContourPoints;
-    this.nFlamConcContourPoints = nFlamConcContourPoints;
-    this.areaFootprintFlamConc = areaFootprintFlamConc;
-    this.distancesToPoolFireRadiation = distancesToPoolFireRadiation;
-    this.poolContourPoints = poolContourPoints;
-    this.nPoolContourPoints = nPoolContourPoints;
-    this.areaContourPool = areaContourPool;
-    this.explosionOverpressureResults = explosionOverpressureResults;
-    this.distancesToToxicConcentration = distancesToToxicConcentration;
-    this.toxicConcentrationUsed = toxicConcentrationUsed;
-    this.toxicConcContourPoints = toxicConcContourPoints;
-    this.nToxicConcContourPoints = nToxicConcContourPoints;
-    this.areaFootprintToxicConc = areaFootprintToxicConc;
-    this.jetFireFlameResult = jetFireFlameResult;
-    this.poolFireFlameResult = poolFireFlameResult;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.dischargeRecord = data.dischargeRecord;
+    this.distancesToJetFireRadiation = data.distancesToJetFireRadiation;
+    this.jetContourPoints = data.jetContourPoints;
+    this.nJetContourPoints = data.nJetContourPoints;
+    this.areaContourJet = data.areaContourJet;
+    this.distancesToFlamConcentration = data.distancesToFlamConcentration;
+    this.flamConcentrationsUsed = data.flamConcentrationsUsed;
+    this.flamConcContourPoints = data.flamConcContourPoints;
+    this.nFlamConcContourPoints = data.nFlamConcContourPoints;
+    this.areaFootprintFlamConc = data.areaFootprintFlamConc;
+    this.distancesToPoolFireRadiation = data.distancesToPoolFireRadiation;
+    this.poolContourPoints = data.poolContourPoints;
+    this.nPoolContourPoints = data.nPoolContourPoints;
+    this.areaContourPool = data.areaContourPool;
+    this.explosionOverpressureResults = data.explosionOverpressureResults;
+    this.distancesToToxicConcentration = data.distancesToToxicConcentration;
+    this.toxicConcentrationUsed = data.toxicConcentrationUsed;
+    this.toxicConcContourPoints = data.toxicConcContourPoints;
+    this.nToxicConcContourPoints = data.nToxicConcContourPoints;
+    this.areaFootprintToxicConc = data.areaFootprintToxicConc;
+    this.jetFireFlameResult = data.jetFireFlameResult;
+    this.poolFireFlameResult = data.poolFireFlameResult;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -2700,7 +2399,7 @@ export class VesselLineRuptureLinkedRunCalculationResponse extends CalculationRe
   }
 }
 
-export interface VesselLineRuptureLinkedRunCalculationResponseSchemaData {
+export interface VesselLeakLinkedRunCalculationResponseSchemaData {
   dischargeRecord: Entities.DischargeRecord;
   distancesToJetFireRadiation: number[];
   jetContourPoints: Entities.LocalPosition[];
@@ -2729,12 +2428,12 @@ export interface VesselLineRuptureLinkedRunCalculationResponseSchemaData {
   operationId: string;
 }
 
-export class VesselLineRuptureLinkedRunCalculationResponseSchema {
+export class VesselLeakLinkedRunCalculationResponseSchema {
   schema: Joi.ObjectSchema;
   propertyTypes: Record<string, string>;
 
   /**
-   * Schema for the VesselLineRuptureLinkedRun calculation response.
+   * Schema for the VesselLeakLinkedRun calculation response.
    */
   constructor() {
     this.schema = Joi.object({
@@ -2792,7 +2491,7 @@ export class VesselLineRuptureLinkedRunCalculationResponseSchema {
     };
   }
 
-  validate(data: VesselLineRuptureLinkedRunCalculationResponseSchemaData): VesselLineRuptureLinkedRunCalculationResponse {
+  validate(data: VesselLeakLinkedRunCalculationResponseSchemaData): VesselLeakLinkedRunCalculationResponse {
     const { error, value } = this.schema.validate(data, { abortEarly: false });
     if (error) {
       throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
@@ -2800,41 +2499,14 @@ export class VesselLineRuptureLinkedRunCalculationResponseSchema {
     return this.makeCalculationResponse(value);
   }
 
-  makeCalculationResponse(data: VesselLineRuptureLinkedRunCalculationResponseSchemaData): VesselLineRuptureLinkedRunCalculationResponse {
-    return new VesselLineRuptureLinkedRunCalculationResponse(
-      data.dischargeRecord,
-      data.distancesToJetFireRadiation,
-      data.jetContourPoints,
-      data.nJetContourPoints,
-      data.areaContourJet,
-      data.distancesToFlamConcentration,
-      data.flamConcentrationsUsed,
-      data.flamConcContourPoints,
-      data.nFlamConcContourPoints,
-      data.areaFootprintFlamConc,
-      data.distancesToPoolFireRadiation,
-      data.poolContourPoints,
-      data.nPoolContourPoints,
-      data.areaContourPool,
-      data.explosionOverpressureResults,
-      data.distancesToToxicConcentration,
-      data.toxicConcentrationUsed,
-      data.toxicConcContourPoints,
-      data.nToxicConcContourPoints,
-      data.areaFootprintToxicConc,
-      data.jetFireFlameResult,
-      data.poolFireFlameResult,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+  makeCalculationResponse(data: VesselLeakLinkedRunCalculationResponseSchemaData): VesselLeakLinkedRunCalculationResponse {
+    return new VesselLeakLinkedRunCalculationResponse(data);
   }
 }
 
-export interface VesselReliefValveLinkedRunCalculationRequestSchemaData {
+export interface VesselLineRuptureLinkedRunCalculationRequestSchemaData {
   vessel: Entities.Vessel;
-  reliefValve: Entities.ReliefValve;
+  lineRupture: Entities.LineRupture;
   dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
   weather: Entities.Weather;
@@ -2855,9 +2527,9 @@ export interface VesselReliefValveLinkedRunCalculationRequestSchemaData {
   explosionConfinedVolumeCount: number;
 }
 
-class VesselReliefValveLinkedRunCalculationRequest extends CalculationRequestBase {
+class VesselLineRuptureLinkedRunCalculationRequest extends CalculationRequestBase {
   vessel: Entities.Vessel;
-  reliefValve: Entities.ReliefValve;
+  lineRupture: Entities.LineRupture;
   dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
   weather: Entities.Weather;
@@ -2878,32 +2550,12 @@ class VesselReliefValveLinkedRunCalculationRequest extends CalculationRequestBas
   explosionConfinedVolumeCount: number;
 
   /**
-   * VesselReliefValveLinkedRun calculation request class.
+   * VesselLineRuptureLinkedRun calculation request class.
    *
-   * @param {Entities.Vessel} vessel -  a vessel entity.
-   * @param {Entities.ReliefValve} reliefValve -  a relief valve entity.
-   * @param {Entities.DischargeParameters} dischargeParameters -  a discharge parameters entity.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionParameters[]} dispersionParameters -  an array of dispersion parameters.
-   * @param {number} dispersionParameterCount - Number of dispersion parameters.
-   * @param {number} endPointConcentration - Concentration at which the dispersion calculations will terminate (v/v fraction).
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.ExplosionParameters} explosionParameters -  an explosion parameters entity.
-   * @param {Entities.DispersionOutputConfig[]} dispersionFlamOutputConfigs -  an array of dispersion output configs for flammable concentrations of interest.
-   * @param {number} dispersionFlamOutputConfigCount - Number of dispersion output configs for flammable concentrations of interest.
-   * @param {Entities.DispersionOutputConfig[]} dispersionToxicOutputConfigs -  an array of dispersion output configs for toxic concentrations of interest.
-   * @param {number} dispersionToxicOutputConfigCount - Number of dispersion output configs for toxic concentrations of interest.
-   * @param {Entities.FlammableOutputConfig[]} flammableOutputConfigs -  an array of flammable output configs for radiation levels of interest.
-   * @param {number} flammableOutputConfigCount - Number of flammable ouput configs for radiation levels of interest.
-   * @param {Entities.ExplosionOutputConfig[]} explosionOutputConfigs -  an array of explosion output configs for overpressure levels of interest.
-   * @param {number} explosionOutputConfigCount - Number of explosion output configs for overpressure levels of interest.
-   * @param {Entities.ExplosionConfinedVolume[]} explosionConfinedVolumes -  an array of explosion confined volumes.
-   * @param {number} explosionConfinedVolumeCount - Number of explosion confined volumes.
    */
-  constructor(
+  constructor(data: {
     vessel: Entities.Vessel,
-    reliefValve: Entities.ReliefValve,
+    lineRupture: Entities.LineRupture,
     dischargeParameters: Entities.DischargeParameters,
     substrate: Entities.Substrate,
     weather: Entities.Weather,
@@ -2922,42 +2574,42 @@ class VesselReliefValveLinkedRunCalculationRequest extends CalculationRequestBas
     explosionOutputConfigCount: number,
     explosionConfinedVolumes: Entities.ExplosionConfinedVolume[],
     explosionConfinedVolumeCount: number
-  ) {
+  }) {
     super();
-    this.vessel = vessel;
-    this.reliefValve = reliefValve;
-    this.dischargeParameters = dischargeParameters;
-    this.substrate = substrate;
-    this.weather = weather;
-    this.dispersionParameters = dispersionParameters;
-    this.dispersionParameterCount = dispersionParameterCount;
-    this.endPointConcentration = endPointConcentration;
-    this.flammableParameters = flammableParameters;
-    this.explosionParameters = explosionParameters;
-    this.dispersionFlamOutputConfigs = dispersionFlamOutputConfigs;
-    this.dispersionFlamOutputConfigCount = dispersionFlamOutputConfigCount;
-    this.dispersionToxicOutputConfigs = dispersionToxicOutputConfigs;
-    this.dispersionToxicOutputConfigCount = dispersionToxicOutputConfigCount;
-    this.flammableOutputConfigs = flammableOutputConfigs;
-    this.flammableOutputConfigCount = flammableOutputConfigCount;
-    this.explosionOutputConfigs = explosionOutputConfigs;
-    this.explosionOutputConfigCount = explosionOutputConfigCount;
-    this.explosionConfinedVolumes = explosionConfinedVolumes;
-    this.explosionConfinedVolumeCount = explosionConfinedVolumeCount;
+    this.vessel = data.vessel;
+    this.lineRupture = data.lineRupture;
+    this.dischargeParameters = data.dischargeParameters;
+    this.substrate = data.substrate;
+    this.weather = data.weather;
+    this.dispersionParameters = data.dispersionParameters;
+    this.dispersionParameterCount = data.dispersionParameterCount;
+    this.endPointConcentration = data.endPointConcentration;
+    this.flammableParameters = data.flammableParameters;
+    this.explosionParameters = data.explosionParameters;
+    this.dispersionFlamOutputConfigs = data.dispersionFlamOutputConfigs;
+    this.dispersionFlamOutputConfigCount = data.dispersionFlamOutputConfigCount;
+    this.dispersionToxicOutputConfigs = data.dispersionToxicOutputConfigs;
+    this.dispersionToxicOutputConfigCount = data.dispersionToxicOutputConfigCount;
+    this.flammableOutputConfigs = data.flammableOutputConfigs;
+    this.flammableOutputConfigCount = data.flammableOutputConfigCount;
+    this.explosionOutputConfigs = data.explosionOutputConfigs;
+    this.explosionOutputConfigCount = data.explosionOutputConfigCount;
+    this.explosionConfinedVolumes = data.explosionConfinedVolumes;
+    this.explosionConfinedVolumeCount = data.explosionConfinedVolumeCount;
   }
 }
 
-export class VesselReliefValveLinkedRunCalculationRequestSchema {
+export class VesselLineRuptureLinkedRunCalculationRequestSchema {
   schema: Joi.ObjectSchema;
   propertyTypes: Record<string, string>;
 
   /**
-   * Schema for the VesselReliefValveLinkedRun calculation request.
+   * Schema for the VesselLineRuptureLinkedRun calculation request.
    */
   constructor() {
     this.schema = Joi.object({
       vessel: new EntitySchemas.VesselSchema().schema,
-      reliefValve: new EntitySchemas.ReliefValveSchema().schema,
+      lineRupture: new EntitySchemas.LineRuptureSchema().schema,
       dischargeParameters: new EntitySchemas.DischargeParametersSchema().schema,
       substrate: new EntitySchemas.SubstrateSchema().schema,
       weather: new EntitySchemas.WeatherSchema().schema,
@@ -2980,7 +2632,7 @@ export class VesselReliefValveLinkedRunCalculationRequestSchema {
 
     this.propertyTypes = {
       vessel: "Entities.Vessel",
-      reliefValve: "Entities.ReliefValve",
+      lineRupture: "Entities.LineRupture",
       dischargeParameters: "Entities.DischargeParameters",
       substrate: "Entities.Substrate",
       weather: "Entities.Weather",
@@ -3002,7 +2654,7 @@ export class VesselReliefValveLinkedRunCalculationRequestSchema {
     };
   }
 
-  validate(data: VesselReliefValveLinkedRunCalculationRequestSchemaData): VesselReliefValveLinkedRunCalculationRequest {
+  validate(data: VesselLineRuptureLinkedRunCalculationRequestSchemaData): VesselLineRuptureLinkedRunCalculationRequest {
     const { error, value } = this.schema.validate(data, { abortEarly: false });
     if (error) {
       throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
@@ -3010,35 +2662,14 @@ export class VesselReliefValveLinkedRunCalculationRequestSchema {
     return this.makeCalculationRequest(value);
   }
 
-  makeCalculationRequest(data: VesselReliefValveLinkedRunCalculationRequestSchemaData): VesselReliefValveLinkedRunCalculationRequest {
-    return new VesselReliefValveLinkedRunCalculationRequest(
-      data.vessel,
-      data.reliefValve,
-      data.dischargeParameters,
-      data.substrate,
-      data.weather,
-      data.dispersionParameters,
-      data.dispersionParameterCount,
-      data.endPointConcentration,
-      data.flammableParameters,
-      data.explosionParameters,
-      data.dispersionFlamOutputConfigs,
-      data.dispersionFlamOutputConfigCount,
-      data.dispersionToxicOutputConfigs,
-      data.dispersionToxicOutputConfigCount,
-      data.flammableOutputConfigs,
-      data.flammableOutputConfigCount,
-      data.explosionOutputConfigs,
-      data.explosionOutputConfigCount,
-      data.explosionConfinedVolumes,
-      data.explosionConfinedVolumeCount
-    );
+  makeCalculationRequest(data: VesselLineRuptureLinkedRunCalculationRequestSchemaData): VesselLineRuptureLinkedRunCalculationRequest {
+    return new VesselLineRuptureLinkedRunCalculationRequest(data);
   }
 }
 
-export class VesselReliefValveLinkedRunCalculation extends CalculationBase {
+export class VesselLineRuptureLinkedRunCalculation extends CalculationBase {
   vessel: Entities.Vessel;
-  reliefValve: Entities.ReliefValve;
+  lineRupture: Entities.LineRupture;
   dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
   weather: Entities.Weather;
@@ -3081,32 +2712,12 @@ export class VesselReliefValveLinkedRunCalculation extends CalculationBase {
   poolFireFlameResult?: Entities.PoolFireFlameResult;
 
   /**
-   *  Calculates maximum distance to a number of concentration, radiation and overpressure levels for flammable and toxic materials, given a vessel, relief valve and weather definition.
+   *  Calculates maximum distance to a number of concentration, radiation and overpressure levels for flammable and toxic materials, given a vessel, line rupture and weather definition.
    *
-   * @param {Entities.Vessel} vessel -  a vessel entity.
-   * @param {Entities.ReliefValve} reliefValve -  a relief valve entity.
-   * @param {Entities.DischargeParameters} dischargeParameters -  a discharge parameters entity.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionParameters[]} dispersionParameters -  an array of dispersion parameters.
-   * @param {number} dispersionParameterCount - Number of dispersion parameters.
-   * @param {number} endPointConcentration - Concentration at which the dispersion calculations will terminate (v/v fraction).
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.ExplosionParameters} explosionParameters -  an explosion parameters entity.
-   * @param {Entities.DispersionOutputConfig[]} dispersionFlamOutputConfigs -  an array of dispersion output configs for flammable concentrations of interest.
-   * @param {number} dispersionFlamOutputConfigCount - Number of dispersion output configs for flammable concentrations of interest.
-   * @param {Entities.DispersionOutputConfig[]} dispersionToxicOutputConfigs -  an array of dispersion output configs for toxic concentrations of interest.
-   * @param {number} dispersionToxicOutputConfigCount - Number of dispersion output configs for toxic concentrations of interest.
-   * @param {Entities.FlammableOutputConfig[]} flammableOutputConfigs -  an array of flammable output configs for radiation levels of interest.
-   * @param {number} flammableOutputConfigCount - Number of flammable ouput configs for radiation levels of interest.
-   * @param {Entities.ExplosionOutputConfig[]} explosionOutputConfigs -  an array of explosion output configs for overpressure levels of interest.
-   * @param {number} explosionOutputConfigCount - Number of explosion output configs for overpressure levels of interest.
-   * @param {Entities.ExplosionConfinedVolume[]} explosionConfinedVolumes -  an array of explosion confined volumes.
-   * @param {number} explosionConfinedVolumeCount - Number of explosion confined volumes.
    */
-  constructor(
+  constructor(data: {
     vessel: Entities.Vessel,
-    reliefValve: Entities.ReliefValve,
+    lineRupture: Entities.LineRupture,
     dischargeParameters: Entities.DischargeParameters,
     substrate: Entities.Substrate,
     weather: Entities.Weather,
@@ -3125,66 +2736,67 @@ export class VesselReliefValveLinkedRunCalculation extends CalculationBase {
     explosionOutputConfigCount: number,
     explosionConfinedVolumes: Entities.ExplosionConfinedVolume[],
     explosionConfinedVolumeCount: number
-  ) {
-    super();
-    this.vessel = vessel;
-    this.reliefValve = reliefValve;
-    this.dischargeParameters = dischargeParameters;
-    this.substrate = substrate;
-    this.weather = weather;
-    this.dispersionParameters = dispersionParameters;
-    this.dispersionParameterCount = dispersionParameterCount;
-    this.endPointConcentration = endPointConcentration;
-    this.flammableParameters = flammableParameters;
-    this.explosionParameters = explosionParameters;
-    this.dispersionFlamOutputConfigs = dispersionFlamOutputConfigs;
-    this.dispersionFlamOutputConfigCount = dispersionFlamOutputConfigCount;
-    this.dispersionToxicOutputConfigs = dispersionToxicOutputConfigs;
-    this.dispersionToxicOutputConfigCount = dispersionToxicOutputConfigCount;
-    this.flammableOutputConfigs = flammableOutputConfigs;
-    this.flammableOutputConfigCount = flammableOutputConfigCount;
-    this.explosionOutputConfigs = explosionOutputConfigs;
-    this.explosionOutputConfigCount = explosionOutputConfigCount;
-    this.explosionConfinedVolumes = explosionConfinedVolumes;
-    this.explosionConfinedVolumeCount = explosionConfinedVolumeCount;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.vessel = data.vessel;
+    this.lineRupture = data.lineRupture;
+    this.dischargeParameters = data.dischargeParameters;
+    this.substrate = data.substrate;
+    this.weather = data.weather;
+    this.dispersionParameters = data.dispersionParameters;
+    this.dispersionParameterCount = data.dispersionParameterCount;
+    this.endPointConcentration = data.endPointConcentration;
+    this.flammableParameters = data.flammableParameters;
+    this.explosionParameters = data.explosionParameters;
+    this.dispersionFlamOutputConfigs = data.dispersionFlamOutputConfigs;
+    this.dispersionFlamOutputConfigCount = data.dispersionFlamOutputConfigCount;
+    this.dispersionToxicOutputConfigs = data.dispersionToxicOutputConfigs;
+    this.dispersionToxicOutputConfigCount = data.dispersionToxicOutputConfigCount;
+    this.flammableOutputConfigs = data.flammableOutputConfigs;
+    this.flammableOutputConfigCount = data.flammableOutputConfigCount;
+    this.explosionOutputConfigs = data.explosionOutputConfigs;
+    this.explosionOutputConfigCount = data.explosionOutputConfigCount;
+    this.explosionConfinedVolumes = data.explosionConfinedVolumes;
+    this.explosionConfinedVolumeCount = data.explosionConfinedVolumeCount;
   }
 
   async run() {
     try {
-      const request = new VesselReliefValveLinkedRunCalculationRequest(
-        this.vessel,
-        this.reliefValve,
-        this.dischargeParameters,
-        this.substrate,
-        this.weather,
-        this.dispersionParameters,
-        this.dispersionParameterCount,
-        this.endPointConcentration,
-        this.flammableParameters,
-        this.explosionParameters,
-        this.dispersionFlamOutputConfigs,
-        this.dispersionFlamOutputConfigCount,
-        this.dispersionToxicOutputConfigs,
-        this.dispersionToxicOutputConfigCount,
-        this.flammableOutputConfigs,
-        this.flammableOutputConfigCount,
-        this.explosionOutputConfigs,
-        this.explosionOutputConfigCount,
-        this.explosionConfinedVolumes,
-        this.explosionConfinedVolumeCount
-      );
+      const request = new VesselLineRuptureLinkedRunCalculationRequest({
+        vessel: this.vessel,
+        lineRupture: this.lineRupture,
+        dischargeParameters: this.dischargeParameters,
+        substrate: this.substrate,
+        weather: this.weather,
+        dispersionParameters: this.dispersionParameters,
+        dispersionParameterCount: this.dispersionParameterCount,
+        endPointConcentration: this.endPointConcentration,
+        flammableParameters: this.flammableParameters,
+        explosionParameters: this.explosionParameters,
+        dispersionFlamOutputConfigs: this.dispersionFlamOutputConfigs,
+        dispersionFlamOutputConfigCount: this.dispersionFlamOutputConfigCount,
+        dispersionToxicOutputConfigs: this.dispersionToxicOutputConfigs,
+        dispersionToxicOutputConfigCount: this.dispersionToxicOutputConfigCount,
+        flammableOutputConfigs: this.flammableOutputConfigs,
+        flammableOutputConfigCount: this.flammableOutputConfigCount,
+        explosionOutputConfigs: this.explosionOutputConfigs,
+        explosionOutputConfigCount: this.explosionOutputConfigCount,
+        explosionConfinedVolumes: this.explosionConfinedVolumes,
+        explosionConfinedVolumeCount: this.explosionConfinedVolumeCount
+      });
 
-      const schema = new VesselReliefValveLinkedRunCalculationRequestSchema();
+      const schema = new VesselLineRuptureLinkedRunCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
 
       const requestJson = JSON.stringify(validatedRequest);
-      const url = `${getAnalyticsApiTarget()}vesselreliefvalvelinkedrun?clientId=${getClientAliasId()}`;
+      const url = `${getAnalyticsApiTarget()}vessellinerupturelinkedrun?clientId=${getClientAliasId()}`;
 
       this.resultCode = Enums.ResultCode.UNEXPECTED_APPLICATION_ERROR;
 
       const { data } = await this.postRequest(url, requestJson);
 
-      const responseSchema = new VesselReliefValveLinkedRunCalculationResponseSchema();
+      const responseSchema = new VesselLineRuptureLinkedRunCalculationResponseSchema();
       const validatedResponse = responseSchema.validate(data);
 
       this.resultCode = validatedResponse.resultCode;
@@ -3233,7 +2845,7 @@ export class VesselReliefValveLinkedRunCalculation extends CalculationBase {
   }
 
   toString() {
-    const parts = ["* VesselReliefValveLinkedRun"];
+    const parts = ["* VesselLineRuptureLinkedRun"];
 
     parts.push(`dischargeRecord: ${String(this.dischargeRecord)}`);
     parts.push("*** distancesToJetFireRadiation:");
@@ -3362,7 +2974,7 @@ export class VesselReliefValveLinkedRunCalculation extends CalculationBase {
   }
 }
 
-export class VesselReliefValveLinkedRunCalculationResponse extends CalculationResponseBase {
+export class VesselLineRuptureLinkedRunCalculationResponse extends CalculationResponseBase {
   dischargeRecord: Entities.DischargeRecord;
   distancesToJetFireRadiation: number[];
   jetContourPoints: Entities.LocalPosition[];
@@ -3387,32 +2999,10 @@ export class VesselReliefValveLinkedRunCalculationResponse extends CalculationRe
   poolFireFlameResult: Entities.PoolFireFlameResult;
 
   /**
-   * VesselReliefValveLinkedRun calculation response class.
+   * VesselLineRuptureLinkedRun calculation response class.
    *
-   * @param {Entities.DischargeRecord} dischargeRecord -  a discharge record entity.
-   * @param {number[]} distancesToJetFireRadiation -  an array of distances to jet fire radiation levels, ordered according to the flammable output configs.
-   * @param {Entities.LocalPosition[]} jetContourPoints -  an array of jet fire radiation ellipse contour points, ordered according to the flammable output configs.
-   * @param {number[]} nJetContourPoints -  an array of the number of jet fire radiation ellipse contour points, ordered according to the flammable output configs.
-   * @param {number[]} areaContourJet -  an array of areas of the jet fire ellipses, ordered according to the flammable output configs.
-   * @param {number[]} distancesToFlamConcentration -  an array of distances to flammable concentration levels, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {number[]} flamConcentrationsUsed -  an array of flammable concentration levels used in the calculations, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {Entities.LocalPosition[]} flamConcContourPoints -  an array of maximum flammable concentration footprint contour points, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {number[]} nFlamConcContourPoints -  an array of the number of maximum flammable concentration footprint contour points, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {number[]} areaFootprintFlamConc -  an array of areas of the maximum flammable concentration footprint contours, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {number[]} distancesToPoolFireRadiation -  an array of distances to pool fire radiation levels, ordered according to the flammable output configs.
-   * @param {Entities.LocalPosition[]} poolContourPoints -  an array of pool fire radiation contour points, ordered according to the flammable output configs.
-   * @param {number[]} nPoolContourPoints -  an array of the number of pool fire radiation contour points, ordered according to the flammable output configs.
-   * @param {number[]} areaContourPool -  an array of areas of the pool fire ellipses, ordered according to the flammable output configs.
-   * @param {Entities.ExplosionOverpressureResult[]} explosionOverpressureResults -  an array of explosion overpressure results, ordered according to the explosion output configs.
-   * @param {number[]} distancesToToxicConcentration -  an array of distances to toxic concentration levels, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {number[]} toxicConcentrationUsed -  an array of toxic concentration levels used in the calculations, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {Entities.LocalPosition[]} toxicConcContourPoints -  an array of maximum toxic concentration footprint contour points, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {number[]} nToxicConcContourPoints -  an array of the number of maximum toxic concentration footprint contour points, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {number[]} areaFootprintToxicConc -  an array of areas of the maximum toxic concentration footprint contours, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {Entities.FlameResult} jetFireFlameResult -  a flame results entity, for jet fire.
-   * @param {Entities.PoolFireFlameResult} poolFireFlameResult -  a pool fire flame results entity, for pool fire.
    */
-  constructor(
+  constructor(data: {
     dischargeRecord: Entities.DischargeRecord,
     distancesToJetFireRadiation: number[],
     jetContourPoints: Entities.LocalPosition[],
@@ -3439,34 +3029,34 @@ export class VesselReliefValveLinkedRunCalculationResponse extends CalculationRe
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.dischargeRecord = dischargeRecord;
-    this.distancesToJetFireRadiation = distancesToJetFireRadiation;
-    this.jetContourPoints = jetContourPoints;
-    this.nJetContourPoints = nJetContourPoints;
-    this.areaContourJet = areaContourJet;
-    this.distancesToFlamConcentration = distancesToFlamConcentration;
-    this.flamConcentrationsUsed = flamConcentrationsUsed;
-    this.flamConcContourPoints = flamConcContourPoints;
-    this.nFlamConcContourPoints = nFlamConcContourPoints;
-    this.areaFootprintFlamConc = areaFootprintFlamConc;
-    this.distancesToPoolFireRadiation = distancesToPoolFireRadiation;
-    this.poolContourPoints = poolContourPoints;
-    this.nPoolContourPoints = nPoolContourPoints;
-    this.areaContourPool = areaContourPool;
-    this.explosionOverpressureResults = explosionOverpressureResults;
-    this.distancesToToxicConcentration = distancesToToxicConcentration;
-    this.toxicConcentrationUsed = toxicConcentrationUsed;
-    this.toxicConcContourPoints = toxicConcContourPoints;
-    this.nToxicConcContourPoints = nToxicConcContourPoints;
-    this.areaFootprintToxicConc = areaFootprintToxicConc;
-    this.jetFireFlameResult = jetFireFlameResult;
-    this.poolFireFlameResult = poolFireFlameResult;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.dischargeRecord = data.dischargeRecord;
+    this.distancesToJetFireRadiation = data.distancesToJetFireRadiation;
+    this.jetContourPoints = data.jetContourPoints;
+    this.nJetContourPoints = data.nJetContourPoints;
+    this.areaContourJet = data.areaContourJet;
+    this.distancesToFlamConcentration = data.distancesToFlamConcentration;
+    this.flamConcentrationsUsed = data.flamConcentrationsUsed;
+    this.flamConcContourPoints = data.flamConcContourPoints;
+    this.nFlamConcContourPoints = data.nFlamConcContourPoints;
+    this.areaFootprintFlamConc = data.areaFootprintFlamConc;
+    this.distancesToPoolFireRadiation = data.distancesToPoolFireRadiation;
+    this.poolContourPoints = data.poolContourPoints;
+    this.nPoolContourPoints = data.nPoolContourPoints;
+    this.areaContourPool = data.areaContourPool;
+    this.explosionOverpressureResults = data.explosionOverpressureResults;
+    this.distancesToToxicConcentration = data.distancesToToxicConcentration;
+    this.toxicConcentrationUsed = data.toxicConcentrationUsed;
+    this.toxicConcContourPoints = data.toxicConcContourPoints;
+    this.nToxicConcContourPoints = data.nToxicConcContourPoints;
+    this.areaFootprintToxicConc = data.areaFootprintToxicConc;
+    this.jetFireFlameResult = data.jetFireFlameResult;
+    this.poolFireFlameResult = data.poolFireFlameResult;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -3585,7 +3175,7 @@ export class VesselReliefValveLinkedRunCalculationResponse extends CalculationRe
   }
 }
 
-export interface VesselReliefValveLinkedRunCalculationResponseSchemaData {
+export interface VesselLineRuptureLinkedRunCalculationResponseSchemaData {
   dischargeRecord: Entities.DischargeRecord;
   distancesToJetFireRadiation: number[];
   jetContourPoints: Entities.LocalPosition[];
@@ -3614,12 +3204,12 @@ export interface VesselReliefValveLinkedRunCalculationResponseSchemaData {
   operationId: string;
 }
 
-export class VesselReliefValveLinkedRunCalculationResponseSchema {
+export class VesselLineRuptureLinkedRunCalculationResponseSchema {
   schema: Joi.ObjectSchema;
   propertyTypes: Record<string, string>;
 
   /**
-   * Schema for the VesselReliefValveLinkedRun calculation response.
+   * Schema for the VesselLineRuptureLinkedRun calculation response.
    */
   constructor() {
     this.schema = Joi.object({
@@ -3677,7 +3267,7 @@ export class VesselReliefValveLinkedRunCalculationResponseSchema {
     };
   }
 
-  validate(data: VesselReliefValveLinkedRunCalculationResponseSchemaData): VesselReliefValveLinkedRunCalculationResponse {
+  validate(data: VesselLineRuptureLinkedRunCalculationResponseSchemaData): VesselLineRuptureLinkedRunCalculationResponse {
     const { error, value } = this.schema.validate(data, { abortEarly: false });
     if (error) {
       throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
@@ -3685,43 +3275,17 @@ export class VesselReliefValveLinkedRunCalculationResponseSchema {
     return this.makeCalculationResponse(value);
   }
 
-  makeCalculationResponse(data: VesselReliefValveLinkedRunCalculationResponseSchemaData): VesselReliefValveLinkedRunCalculationResponse {
-    return new VesselReliefValveLinkedRunCalculationResponse(
-      data.dischargeRecord,
-      data.distancesToJetFireRadiation,
-      data.jetContourPoints,
-      data.nJetContourPoints,
-      data.areaContourJet,
-      data.distancesToFlamConcentration,
-      data.flamConcentrationsUsed,
-      data.flamConcContourPoints,
-      data.nFlamConcContourPoints,
-      data.areaFootprintFlamConc,
-      data.distancesToPoolFireRadiation,
-      data.poolContourPoints,
-      data.nPoolContourPoints,
-      data.areaContourPool,
-      data.explosionOverpressureResults,
-      data.distancesToToxicConcentration,
-      data.toxicConcentrationUsed,
-      data.toxicConcContourPoints,
-      data.nToxicConcContourPoints,
-      data.areaFootprintToxicConc,
-      data.jetFireFlameResult,
-      data.poolFireFlameResult,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+  makeCalculationResponse(data: VesselLineRuptureLinkedRunCalculationResponseSchemaData): VesselLineRuptureLinkedRunCalculationResponse {
+    return new VesselLineRuptureLinkedRunCalculationResponse(data);
   }
 }
 
-export interface BESSLinkedRunnerCalculationRequestSchemaData {
-  bessUnit: Entities.BESSUnit;
-  bessRelease: Entities.BESSRelease;
-  weather: Entities.Weather;
+export interface VesselReliefValveLinkedRunCalculationRequestSchemaData {
+  vessel: Entities.Vessel;
+  reliefValve: Entities.ReliefValve;
+  dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
+  weather: Entities.Weather;
   dispersionParameters: Entities.DispersionParameters[];
   dispersionParameterCount: number;
   endPointConcentration: number;
@@ -3739,11 +3303,12 @@ export interface BESSLinkedRunnerCalculationRequestSchemaData {
   explosionConfinedVolumeCount: number;
 }
 
-class BESSLinkedRunnerCalculationRequest extends CalculationRequestBase {
-  bessUnit: Entities.BESSUnit;
-  bessRelease: Entities.BESSRelease;
-  weather: Entities.Weather;
+class VesselReliefValveLinkedRunCalculationRequest extends CalculationRequestBase {
+  vessel: Entities.Vessel;
+  reliefValve: Entities.ReliefValve;
+  dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
+  weather: Entities.Weather;
   dispersionParameters: Entities.DispersionParameters[];
   dispersionParameterCount: number;
   endPointConcentration: number;
@@ -3761,33 +3326,15 @@ class BESSLinkedRunnerCalculationRequest extends CalculationRequestBase {
   explosionConfinedVolumeCount: number;
 
   /**
-   * BESSLinkedRunner calculation request class.
+   * VesselReliefValveLinkedRun calculation request class.
    *
-   * @param {Entities.BESSUnit} bessUnit -  a BESS unit entity.
-   * @param {Entities.BESSRelease} bessRelease -  a BESS release entity.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.DispersionParameters[]} dispersionParameters -  an array of dispersion parameters.
-   * @param {number} dispersionParameterCount - Number of dispersion parameters.
-   * @param {number} endPointConcentration - Concentration at which the dispersion calculations will terminate (v/v fraction).
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.ExplosionParameters} explosionParameters -  an explosion parameters entity.
-   * @param {Entities.DispersionOutputConfig[]} dispersionFlamOutputConfigs -  an array of dispersion output configs for flammable concentrations of interest.
-   * @param {number} dispersionFlamOutputConfigCount - Number of dispersion output configs for flammable concentrations of interest.
-   * @param {Entities.DispersionOutputConfig[]} dispersionToxicOutputConfigs -  an array of dispersion output configs for toxic concentrations of interest.
-   * @param {number} dispersionToxicOutputConfigCount - Number of dispersion output configs for toxic concentrations of interest.
-   * @param {Entities.FlammableOutputConfig[]} flammableOutputConfigs -  an array of flammable output configs for radiation levels of interest.
-   * @param {number} flammableOutputConfigCount - Number of flammable ouput configs for radiation levels of interest.
-   * @param {Entities.ExplosionOutputConfig[]} explosionOutputConfigs -  an array of explosion output configs for overpressure levels of interest.
-   * @param {number} explosionOutputConfigCount - Number of explosion output configs for overpressure levels of interest.
-   * @param {Entities.ExplosionConfinedVolume[]} explosionConfinedVolumes -  an array of explosion confined volumes.
-   * @param {number} explosionConfinedVolumeCount - Number of explosion confined volumes.
    */
-  constructor(
-    bessUnit: Entities.BESSUnit,
-    bessRelease: Entities.BESSRelease,
-    weather: Entities.Weather,
+  constructor(data: {
+    vessel: Entities.Vessel,
+    reliefValve: Entities.ReliefValve,
+    dischargeParameters: Entities.DischargeParameters,
     substrate: Entities.Substrate,
+    weather: Entities.Weather,
     dispersionParameters: Entities.DispersionParameters[],
     dispersionParameterCount: number,
     endPointConcentration: number,
@@ -3803,43 +3350,45 @@ class BESSLinkedRunnerCalculationRequest extends CalculationRequestBase {
     explosionOutputConfigCount: number,
     explosionConfinedVolumes: Entities.ExplosionConfinedVolume[],
     explosionConfinedVolumeCount: number
-  ) {
+  }) {
     super();
-    this.bessUnit = bessUnit;
-    this.bessRelease = bessRelease;
-    this.weather = weather;
-    this.substrate = substrate;
-    this.dispersionParameters = dispersionParameters;
-    this.dispersionParameterCount = dispersionParameterCount;
-    this.endPointConcentration = endPointConcentration;
-    this.flammableParameters = flammableParameters;
-    this.explosionParameters = explosionParameters;
-    this.dispersionFlamOutputConfigs = dispersionFlamOutputConfigs;
-    this.dispersionFlamOutputConfigCount = dispersionFlamOutputConfigCount;
-    this.dispersionToxicOutputConfigs = dispersionToxicOutputConfigs;
-    this.dispersionToxicOutputConfigCount = dispersionToxicOutputConfigCount;
-    this.flammableOutputConfigs = flammableOutputConfigs;
-    this.flammableOutputConfigCount = flammableOutputConfigCount;
-    this.explosionOutputConfigs = explosionOutputConfigs;
-    this.explosionOutputConfigCount = explosionOutputConfigCount;
-    this.explosionConfinedVolumes = explosionConfinedVolumes;
-    this.explosionConfinedVolumeCount = explosionConfinedVolumeCount;
+    this.vessel = data.vessel;
+    this.reliefValve = data.reliefValve;
+    this.dischargeParameters = data.dischargeParameters;
+    this.substrate = data.substrate;
+    this.weather = data.weather;
+    this.dispersionParameters = data.dispersionParameters;
+    this.dispersionParameterCount = data.dispersionParameterCount;
+    this.endPointConcentration = data.endPointConcentration;
+    this.flammableParameters = data.flammableParameters;
+    this.explosionParameters = data.explosionParameters;
+    this.dispersionFlamOutputConfigs = data.dispersionFlamOutputConfigs;
+    this.dispersionFlamOutputConfigCount = data.dispersionFlamOutputConfigCount;
+    this.dispersionToxicOutputConfigs = data.dispersionToxicOutputConfigs;
+    this.dispersionToxicOutputConfigCount = data.dispersionToxicOutputConfigCount;
+    this.flammableOutputConfigs = data.flammableOutputConfigs;
+    this.flammableOutputConfigCount = data.flammableOutputConfigCount;
+    this.explosionOutputConfigs = data.explosionOutputConfigs;
+    this.explosionOutputConfigCount = data.explosionOutputConfigCount;
+    this.explosionConfinedVolumes = data.explosionConfinedVolumes;
+    this.explosionConfinedVolumeCount = data.explosionConfinedVolumeCount;
   }
 }
 
-export class BESSLinkedRunnerCalculationRequestSchema {
+export class VesselReliefValveLinkedRunCalculationRequestSchema {
   schema: Joi.ObjectSchema;
   propertyTypes: Record<string, string>;
 
   /**
-   * Schema for the BESSLinkedRunner calculation request.
+   * Schema for the VesselReliefValveLinkedRun calculation request.
    */
   constructor() {
     this.schema = Joi.object({
-      bessUnit: new EntitySchemas.BESSUnitSchema().schema,
-      bessRelease: new EntitySchemas.BESSReleaseSchema().schema,
-      weather: new EntitySchemas.WeatherSchema().schema,
+      vessel: new EntitySchemas.VesselSchema().schema,
+      reliefValve: new EntitySchemas.ReliefValveSchema().schema,
+      dischargeParameters: new EntitySchemas.DischargeParametersSchema().schema,
       substrate: new EntitySchemas.SubstrateSchema().schema,
+      weather: new EntitySchemas.WeatherSchema().schema,
       dispersionParameters: Joi.array().items(new EntitySchemas.DispersionParametersSchema().schema).allow(null),
       dispersionParameterCount: Joi.number().integer(),
       endPointConcentration: Joi.number().unsafe(),
@@ -3858,10 +3407,11 @@ export class BESSLinkedRunnerCalculationRequestSchema {
     }).unknown(true);
 
     this.propertyTypes = {
-      bessUnit: "Entities.BESSUnit",
-      bessRelease: "Entities.BESSRelease",
-      weather: "Entities.Weather",
+      vessel: "Entities.Vessel",
+      reliefValve: "Entities.ReliefValve",
+      dischargeParameters: "Entities.DischargeParameters",
       substrate: "Entities.Substrate",
+      weather: "Entities.Weather",
       dispersionParameters: "Entities.DispersionParameters[]",
       dispersionParameterCount: "number",
       endPointConcentration: "number",
@@ -3880,7 +3430,7 @@ export class BESSLinkedRunnerCalculationRequestSchema {
     };
   }
 
-  validate(data: BESSLinkedRunnerCalculationRequestSchemaData): BESSLinkedRunnerCalculationRequest {
+  validate(data: VesselReliefValveLinkedRunCalculationRequestSchemaData): VesselReliefValveLinkedRunCalculationRequest {
     const { error, value } = this.schema.validate(data, { abortEarly: false });
     if (error) {
       throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
@@ -3888,36 +3438,17 @@ export class BESSLinkedRunnerCalculationRequestSchema {
     return this.makeCalculationRequest(value);
   }
 
-  makeCalculationRequest(data: BESSLinkedRunnerCalculationRequestSchemaData): BESSLinkedRunnerCalculationRequest {
-    return new BESSLinkedRunnerCalculationRequest(
-      data.bessUnit,
-      data.bessRelease,
-      data.weather,
-      data.substrate,
-      data.dispersionParameters,
-      data.dispersionParameterCount,
-      data.endPointConcentration,
-      data.flammableParameters,
-      data.explosionParameters,
-      data.dispersionFlamOutputConfigs,
-      data.dispersionFlamOutputConfigCount,
-      data.dispersionToxicOutputConfigs,
-      data.dispersionToxicOutputConfigCount,
-      data.flammableOutputConfigs,
-      data.flammableOutputConfigCount,
-      data.explosionOutputConfigs,
-      data.explosionOutputConfigCount,
-      data.explosionConfinedVolumes,
-      data.explosionConfinedVolumeCount
-    );
+  makeCalculationRequest(data: VesselReliefValveLinkedRunCalculationRequestSchemaData): VesselReliefValveLinkedRunCalculationRequest {
+    return new VesselReliefValveLinkedRunCalculationRequest(data);
   }
 }
 
-export class BESSLinkedRunnerCalculation extends CalculationBase {
-  bessUnit: Entities.BESSUnit;
-  bessRelease: Entities.BESSRelease;
-  weather: Entities.Weather;
+export class VesselReliefValveLinkedRunCalculation extends CalculationBase {
+  vessel: Entities.Vessel;
+  reliefValve: Entities.ReliefValve;
+  dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
+  weather: Entities.Weather;
   dispersionParameters: Entities.DispersionParameters[];
   dispersionParameterCount: number;
   endPointConcentration: number;
@@ -3933,7 +3464,6 @@ export class BESSLinkedRunnerCalculation extends CalculationBase {
   explosionOutputConfigCount: number;
   explosionConfinedVolumes: Entities.ExplosionConfinedVolume[];
   explosionConfinedVolumeCount: number;
-  exitMaterial?: Entities.Material;
   dischargeRecord?: Entities.DischargeRecord;
   distancesToJetFireRadiation?: number[];
   jetContourPoints?: Entities.LocalPosition[];
@@ -3958,33 +3488,15 @@ export class BESSLinkedRunnerCalculation extends CalculationBase {
   poolFireFlameResult?: Entities.PoolFireFlameResult;
 
   /**
-   *  Calculates maximum distance to a number of concentration levels for  toxic materials, given a BESS unit, BESS release and weather definition.
+   *  Calculates maximum distance to a number of concentration, radiation and overpressure levels for flammable and toxic materials, given a vessel, relief valve and weather definition.
    *
-   * @param {Entities.BESSUnit} bessUnit -  a BESS unit entity.
-   * @param {Entities.BESSRelease} bessRelease -  a BESS release entity.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.DispersionParameters[]} dispersionParameters -  an array of dispersion parameters.
-   * @param {number} dispersionParameterCount - Number of dispersion parameters.
-   * @param {number} endPointConcentration - Concentration at which the dispersion calculations will terminate (v/v fraction).
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.ExplosionParameters} explosionParameters -  an explosion parameters entity.
-   * @param {Entities.DispersionOutputConfig[]} dispersionFlamOutputConfigs -  an array of dispersion output configs for flammable concentrations of interest.
-   * @param {number} dispersionFlamOutputConfigCount - Number of dispersion output configs for flammable concentrations of interest.
-   * @param {Entities.DispersionOutputConfig[]} dispersionToxicOutputConfigs -  an array of dispersion output configs for toxic concentrations of interest.
-   * @param {number} dispersionToxicOutputConfigCount - Number of dispersion output configs for toxic concentrations of interest.
-   * @param {Entities.FlammableOutputConfig[]} flammableOutputConfigs -  an array of flammable output configs for radiation levels of interest.
-   * @param {number} flammableOutputConfigCount - Number of flammable ouput configs for radiation levels of interest.
-   * @param {Entities.ExplosionOutputConfig[]} explosionOutputConfigs -  an array of explosion output configs for overpressure levels of interest.
-   * @param {number} explosionOutputConfigCount - Number of explosion output configs for overpressure levels of interest.
-   * @param {Entities.ExplosionConfinedVolume[]} explosionConfinedVolumes -  an array of explosion confined volumes.
-   * @param {number} explosionConfinedVolumeCount - Number of explosion confined volumes.
    */
-  constructor(
-    bessUnit: Entities.BESSUnit,
-    bessRelease: Entities.BESSRelease,
-    weather: Entities.Weather,
+  constructor(data: {
+    vessel: Entities.Vessel,
+    reliefValve: Entities.ReliefValve,
+    dischargeParameters: Entities.DischargeParameters,
     substrate: Entities.Substrate,
+    weather: Entities.Weather,
     dispersionParameters: Entities.DispersionParameters[],
     dispersionParameterCount: number,
     endPointConcentration: number,
@@ -4000,70 +3512,72 @@ export class BESSLinkedRunnerCalculation extends CalculationBase {
     explosionOutputConfigCount: number,
     explosionConfinedVolumes: Entities.ExplosionConfinedVolume[],
     explosionConfinedVolumeCount: number
-  ) {
-    super();
-    this.bessUnit = bessUnit;
-    this.bessRelease = bessRelease;
-    this.weather = weather;
-    this.substrate = substrate;
-    this.dispersionParameters = dispersionParameters;
-    this.dispersionParameterCount = dispersionParameterCount;
-    this.endPointConcentration = endPointConcentration;
-    this.flammableParameters = flammableParameters;
-    this.explosionParameters = explosionParameters;
-    this.dispersionFlamOutputConfigs = dispersionFlamOutputConfigs;
-    this.dispersionFlamOutputConfigCount = dispersionFlamOutputConfigCount;
-    this.dispersionToxicOutputConfigs = dispersionToxicOutputConfigs;
-    this.dispersionToxicOutputConfigCount = dispersionToxicOutputConfigCount;
-    this.flammableOutputConfigs = flammableOutputConfigs;
-    this.flammableOutputConfigCount = flammableOutputConfigCount;
-    this.explosionOutputConfigs = explosionOutputConfigs;
-    this.explosionOutputConfigCount = explosionOutputConfigCount;
-    this.explosionConfinedVolumes = explosionConfinedVolumes;
-    this.explosionConfinedVolumeCount = explosionConfinedVolumeCount;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.vessel = data.vessel;
+    this.reliefValve = data.reliefValve;
+    this.dischargeParameters = data.dischargeParameters;
+    this.substrate = data.substrate;
+    this.weather = data.weather;
+    this.dispersionParameters = data.dispersionParameters;
+    this.dispersionParameterCount = data.dispersionParameterCount;
+    this.endPointConcentration = data.endPointConcentration;
+    this.flammableParameters = data.flammableParameters;
+    this.explosionParameters = data.explosionParameters;
+    this.dispersionFlamOutputConfigs = data.dispersionFlamOutputConfigs;
+    this.dispersionFlamOutputConfigCount = data.dispersionFlamOutputConfigCount;
+    this.dispersionToxicOutputConfigs = data.dispersionToxicOutputConfigs;
+    this.dispersionToxicOutputConfigCount = data.dispersionToxicOutputConfigCount;
+    this.flammableOutputConfigs = data.flammableOutputConfigs;
+    this.flammableOutputConfigCount = data.flammableOutputConfigCount;
+    this.explosionOutputConfigs = data.explosionOutputConfigs;
+    this.explosionOutputConfigCount = data.explosionOutputConfigCount;
+    this.explosionConfinedVolumes = data.explosionConfinedVolumes;
+    this.explosionConfinedVolumeCount = data.explosionConfinedVolumeCount;
   }
 
   async run() {
     try {
-      const request = new BESSLinkedRunnerCalculationRequest(
-        this.bessUnit,
-        this.bessRelease,
-        this.weather,
-        this.substrate,
-        this.dispersionParameters,
-        this.dispersionParameterCount,
-        this.endPointConcentration,
-        this.flammableParameters,
-        this.explosionParameters,
-        this.dispersionFlamOutputConfigs,
-        this.dispersionFlamOutputConfigCount,
-        this.dispersionToxicOutputConfigs,
-        this.dispersionToxicOutputConfigCount,
-        this.flammableOutputConfigs,
-        this.flammableOutputConfigCount,
-        this.explosionOutputConfigs,
-        this.explosionOutputConfigCount,
-        this.explosionConfinedVolumes,
-        this.explosionConfinedVolumeCount
-      );
+      const request = new VesselReliefValveLinkedRunCalculationRequest({
+        vessel: this.vessel,
+        reliefValve: this.reliefValve,
+        dischargeParameters: this.dischargeParameters,
+        substrate: this.substrate,
+        weather: this.weather,
+        dispersionParameters: this.dispersionParameters,
+        dispersionParameterCount: this.dispersionParameterCount,
+        endPointConcentration: this.endPointConcentration,
+        flammableParameters: this.flammableParameters,
+        explosionParameters: this.explosionParameters,
+        dispersionFlamOutputConfigs: this.dispersionFlamOutputConfigs,
+        dispersionFlamOutputConfigCount: this.dispersionFlamOutputConfigCount,
+        dispersionToxicOutputConfigs: this.dispersionToxicOutputConfigs,
+        dispersionToxicOutputConfigCount: this.dispersionToxicOutputConfigCount,
+        flammableOutputConfigs: this.flammableOutputConfigs,
+        flammableOutputConfigCount: this.flammableOutputConfigCount,
+        explosionOutputConfigs: this.explosionOutputConfigs,
+        explosionOutputConfigCount: this.explosionOutputConfigCount,
+        explosionConfinedVolumes: this.explosionConfinedVolumes,
+        explosionConfinedVolumeCount: this.explosionConfinedVolumeCount
+      });
 
-      const schema = new BESSLinkedRunnerCalculationRequestSchema();
+      const schema = new VesselReliefValveLinkedRunCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
 
       const requestJson = JSON.stringify(validatedRequest);
-      const url = `${getAnalyticsApiTarget()}batteryhazardlinkedrun?clientId=${getClientAliasId()}`;
+      const url = `${getAnalyticsApiTarget()}vesselreliefvalvelinkedrun?clientId=${getClientAliasId()}`;
 
       this.resultCode = Enums.ResultCode.UNEXPECTED_APPLICATION_ERROR;
 
       const { data } = await this.postRequest(url, requestJson);
 
-      const responseSchema = new BESSLinkedRunnerCalculationResponseSchema();
+      const responseSchema = new VesselReliefValveLinkedRunCalculationResponseSchema();
       const validatedResponse = responseSchema.validate(data);
 
       this.resultCode = validatedResponse.resultCode;
       if (this.resultCode === Enums.ResultCode.SUCCESS) {
         Object.assign(this, {
-          exitMaterial: validatedResponse.exitMaterial,
           dischargeRecord: validatedResponse.dischargeRecord,
           distancesToJetFireRadiation: validatedResponse.distancesToJetFireRadiation,
           jetContourPoints: validatedResponse.jetContourPoints,
@@ -4107,9 +3621,8 @@ export class BESSLinkedRunnerCalculation extends CalculationBase {
   }
 
   toString() {
-    const parts = ["* BESSLinkedRunner"];
+    const parts = ["* VesselReliefValveLinkedRun"];
 
-    parts.push(`exitMaterial: ${String(this.exitMaterial)}`);
     parts.push(`dischargeRecord: ${String(this.dischargeRecord)}`);
     parts.push("*** distancesToJetFireRadiation:");
     parts.push(
@@ -4237,8 +3750,7 @@ export class BESSLinkedRunnerCalculation extends CalculationBase {
   }
 }
 
-export class BESSLinkedRunnerCalculationResponse extends CalculationResponseBase {
-  exitMaterial: Entities.Material;
+export class VesselReliefValveLinkedRunCalculationResponse extends CalculationResponseBase {
   dischargeRecord: Entities.DischargeRecord;
   distancesToJetFireRadiation: number[];
   jetContourPoints: Entities.LocalPosition[];
@@ -4263,34 +3775,10 @@ export class BESSLinkedRunnerCalculationResponse extends CalculationResponseBase
   poolFireFlameResult: Entities.PoolFireFlameResult;
 
   /**
-   * BESSLinkedRunner calculation response class.
+   * VesselReliefValveLinkedRun calculation response class.
    *
-   * @param {Entities.Material} exitMaterial - Exit material from the BESS unit, dependent on BESS chemistry.
-   * @param {Entities.DischargeRecord} dischargeRecord -  a discharge record entity.
-   * @param {number[]} distancesToJetFireRadiation -  an array of distances to jet fire radiation levels, ordered according to the flammable output configs.
-   * @param {Entities.LocalPosition[]} jetContourPoints -  an array of jet fire radiation contour points, ordered according to the flammable output configs.
-   * @param {number[]} nJetContourPoints -  an array of the number of jet fire radiation contour points, ordered according to the flammable output configs.
-   * @param {number[]} areaContourJet -  an array of areas of the jet fire contours, ordered according to the flammable output configs.
-   * @param {number[]} distancesToFlamConcentration -  an array of distances to flammable concentration levels, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {number[]} flamConcentrationsUsed -  an array of flammable concentration levels used in the calculations, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {Entities.LocalPosition[]} flamConcContourPoints -  an array of maximum flammable concentration footprint contour points, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {number[]} nFlamConcContourPoints -  an array of the number of maximum flammable concentration footprint contour points, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {number[]} areaFootprintFlamConc -  an array of areas of the maximum flammable concentration footprint contours, ordered according to the dispersion output configs for flammable concentrations of interest.
-   * @param {number[]} distancesToPoolFireRadiation -  an array of distances to pool fire radiation levels, ordered according to the flammable output configs.
-   * @param {Entities.LocalPosition[]} poolContourPoints -  an array of pool fire radiation contour points, ordered according to the flammable output configs.
-   * @param {number[]} nPoolContourPoints -  an array of the number of pool fire radiation contour points, ordered according to the flammable output configs.
-   * @param {number[]} areaContourPool -  an array of areas of the pool fire contours, ordered according to the flammable output configs.
-   * @param {Entities.ExplosionOverpressureResult[]} explosionOverpressureResults -  an array of explosion overpressure results, ordered according to the explosion output configs.
-   * @param {number[]} distancesToToxicConcentration -  an array of distances to toxic concentration levels, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {number[]} toxicConcentrationUsed -  an array of toxic concentration levels used in the calculations, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {Entities.LocalPosition[]} toxicConcContourPoints -  an array of maximum toxic concentration footprint contour points, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {number[]} nToxicConcContourPoints -  an array of the number of maximum toxic concentration footprint contour points, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {number[]} areaFootprintToxicConc -  an array of areas of the maximum toxic concentration footprint contours, ordered according to the dispersion output configs for toxic concentrations of interest.
-   * @param {Entities.FlameResult} jetFireFlameResult -  a flame results entity, for jet fire.
-   * @param {Entities.PoolFireFlameResult} poolFireFlameResult -  a pool fire flame results entity, for pool fire.
    */
-  constructor(
-    exitMaterial: Entities.Material,
+  constructor(data: {
     dischargeRecord: Entities.DischargeRecord,
     distancesToJetFireRadiation: number[],
     jetContourPoints: Entities.LocalPosition[],
@@ -4317,42 +3805,37 @@ export class BESSLinkedRunnerCalculationResponse extends CalculationResponseBase
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.exitMaterial = exitMaterial;
-    this.dischargeRecord = dischargeRecord;
-    this.distancesToJetFireRadiation = distancesToJetFireRadiation;
-    this.jetContourPoints = jetContourPoints;
-    this.nJetContourPoints = nJetContourPoints;
-    this.areaContourJet = areaContourJet;
-    this.distancesToFlamConcentration = distancesToFlamConcentration;
-    this.flamConcentrationsUsed = flamConcentrationsUsed;
-    this.flamConcContourPoints = flamConcContourPoints;
-    this.nFlamConcContourPoints = nFlamConcContourPoints;
-    this.areaFootprintFlamConc = areaFootprintFlamConc;
-    this.distancesToPoolFireRadiation = distancesToPoolFireRadiation;
-    this.poolContourPoints = poolContourPoints;
-    this.nPoolContourPoints = nPoolContourPoints;
-    this.areaContourPool = areaContourPool;
-    this.explosionOverpressureResults = explosionOverpressureResults;
-    this.distancesToToxicConcentration = distancesToToxicConcentration;
-    this.toxicConcentrationUsed = toxicConcentrationUsed;
-    this.toxicConcContourPoints = toxicConcContourPoints;
-    this.nToxicConcContourPoints = nToxicConcContourPoints;
-    this.areaFootprintToxicConc = areaFootprintToxicConc;
-    this.jetFireFlameResult = jetFireFlameResult;
-    this.poolFireFlameResult = poolFireFlameResult;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.dischargeRecord = data.dischargeRecord;
+    this.distancesToJetFireRadiation = data.distancesToJetFireRadiation;
+    this.jetContourPoints = data.jetContourPoints;
+    this.nJetContourPoints = data.nJetContourPoints;
+    this.areaContourJet = data.areaContourJet;
+    this.distancesToFlamConcentration = data.distancesToFlamConcentration;
+    this.flamConcentrationsUsed = data.flamConcentrationsUsed;
+    this.flamConcContourPoints = data.flamConcContourPoints;
+    this.nFlamConcContourPoints = data.nFlamConcContourPoints;
+    this.areaFootprintFlamConc = data.areaFootprintFlamConc;
+    this.distancesToPoolFireRadiation = data.distancesToPoolFireRadiation;
+    this.poolContourPoints = data.poolContourPoints;
+    this.nPoolContourPoints = data.nPoolContourPoints;
+    this.areaContourPool = data.areaContourPool;
+    this.explosionOverpressureResults = data.explosionOverpressureResults;
+    this.distancesToToxicConcentration = data.distancesToToxicConcentration;
+    this.toxicConcentrationUsed = data.toxicConcentrationUsed;
+    this.toxicConcContourPoints = data.toxicConcContourPoints;
+    this.nToxicConcContourPoints = data.nToxicConcContourPoints;
+    this.areaFootprintToxicConc = data.areaFootprintToxicConc;
+    this.jetFireFlameResult = data.jetFireFlameResult;
+    this.poolFireFlameResult = data.poolFireFlameResult;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
-    if (data.exitMaterial) {
-      this.exitMaterial = new Entities.Material();
-      this.exitMaterial.initialiseFromDictionary(data.exitMaterial as { [key: string]: unknown });
-    }
     if (data.dischargeRecord) {
       this.dischargeRecord = new Entities.DischargeRecord();
       this.dischargeRecord.initialiseFromDictionary(data.dischargeRecord as { [key: string]: unknown });
@@ -4468,8 +3951,7 @@ export class BESSLinkedRunnerCalculationResponse extends CalculationResponseBase
   }
 }
 
-export interface BESSLinkedRunnerCalculationResponseSchemaData {
-  exitMaterial: Entities.Material;
+export interface VesselReliefValveLinkedRunCalculationResponseSchemaData {
   dischargeRecord: Entities.DischargeRecord;
   distancesToJetFireRadiation: number[];
   jetContourPoints: Entities.LocalPosition[];
@@ -4498,16 +3980,15 @@ export interface BESSLinkedRunnerCalculationResponseSchemaData {
   operationId: string;
 }
 
-export class BESSLinkedRunnerCalculationResponseSchema {
+export class VesselReliefValveLinkedRunCalculationResponseSchema {
   schema: Joi.ObjectSchema;
   propertyTypes: Record<string, string>;
 
   /**
-   * Schema for the BESSLinkedRunner calculation response.
+   * Schema for the VesselReliefValveLinkedRun calculation response.
    */
   constructor() {
     this.schema = Joi.object({
-      exitMaterial: new EntitySchemas.MaterialSchema().schema,
       dischargeRecord: new EntitySchemas.DischargeRecordSchema().schema,
       distancesToJetFireRadiation: Joi.array().items(Joi.number().unsafe()).allow(null),
       jetContourPoints: Joi.array().items(new EntitySchemas.LocalPositionSchema().schema).allow(null),
@@ -4537,7 +4018,6 @@ export class BESSLinkedRunnerCalculationResponseSchema {
     }).unknown(true);
 
     this.propertyTypes = {
-      exitMaterial: "Entities.Material",
       dischargeRecord: "Entities.DischargeRecord",
       distancesToJetFireRadiation: "number[]",
       jetContourPoints: "Entities.LocalPosition[]",
@@ -4563,7 +4043,7 @@ export class BESSLinkedRunnerCalculationResponseSchema {
     };
   }
 
-  validate(data: BESSLinkedRunnerCalculationResponseSchemaData): BESSLinkedRunnerCalculationResponse {
+  validate(data: VesselReliefValveLinkedRunCalculationResponseSchemaData): VesselReliefValveLinkedRunCalculationResponse {
     const { error, value } = this.schema.validate(data, { abortEarly: false });
     if (error) {
       throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
@@ -4571,35 +4051,7 @@ export class BESSLinkedRunnerCalculationResponseSchema {
     return this.makeCalculationResponse(value);
   }
 
-  makeCalculationResponse(data: BESSLinkedRunnerCalculationResponseSchemaData): BESSLinkedRunnerCalculationResponse {
-    return new BESSLinkedRunnerCalculationResponse(
-      data.exitMaterial,
-      data.dischargeRecord,
-      data.distancesToJetFireRadiation,
-      data.jetContourPoints,
-      data.nJetContourPoints,
-      data.areaContourJet,
-      data.distancesToFlamConcentration,
-      data.flamConcentrationsUsed,
-      data.flamConcContourPoints,
-      data.nFlamConcContourPoints,
-      data.areaFootprintFlamConc,
-      data.distancesToPoolFireRadiation,
-      data.poolContourPoints,
-      data.nPoolContourPoints,
-      data.areaContourPool,
-      data.explosionOverpressureResults,
-      data.distancesToToxicConcentration,
-      data.toxicConcentrationUsed,
-      data.toxicConcContourPoints,
-      data.nToxicConcContourPoints,
-      data.areaFootprintToxicConc,
-      data.jetFireFlameResult,
-      data.poolFireFlameResult,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+  makeCalculationResponse(data: VesselReliefValveLinkedRunCalculationResponseSchemaData): VesselReliefValveLinkedRunCalculationResponse {
+    return new VesselReliefValveLinkedRunCalculationResponse(data);
   }
 }