@ricado/api-client 1.4.1 → 2.0.0

package/lib/index.d.ts

@@ -611,123 +611,99 @@ declare module '@ricado/api-client/Models/Site/PointModel' {
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class PointModel extends BaseSiteModel {
+    class PointModel extends BaseModel {
             /**
                 * Create a new **PointModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Point
                 * @return {PointModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): PointModel;
-            /**
-                * PointModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Point
-                */
-            protected constructor();
+            } | string): PointModel;
             /**
                 * The Point ID
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get id(): number;
+            id: number;
             /**
                 * The RTU this Point belongs to
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get rtuId(): number;
+            rtuId: number | null;
             /**
                 * The Plugin ID
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get pluginId(): number;
+            pluginId: number | null;
             /**
                 * The Point Name
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get name(): string;
+            name: string;
             /**
                 * The Point Type
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get type(): string;
+            type: string;
             /**
                 * The Point's Value Type
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get valueType(): string;
+            valueType: string;
             /**
                 * The Permissions
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get permissions(): string;
+            permissions: string;
             /**
                 * Whether the Point is Enabled
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get enabled(): boolean;
+            enabled: boolean;
             /**
                 * The Point Settings
                 *
-                * @public
                 * @type {Object}
+                * @public
                 */
-            get settings(): any;
+            settings: any;
             /**
                 * Whether the Point has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Point was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Point
-                *
-                * @public
-                * @type {number}
-                */
-            get siteId(): number;
-            /**
-                * Convert this **PointModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Controllers/AccountPolicyController' {
@@ -2340,31 +2316,31 @@ declare module '@ricado/api-client/Models/AccountPolicyModel' {
             /**
                 * The Account Policy ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Policy Name
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get name(): string;
+            name: string;
             /**
                 * The Company this Policy belongs to
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get companyId(): string;
+            companyId: string;
             /**
                 * The Resources this Policy provides
                 *
-                * @public
                 * @type {Array<{id: any, type: string, actions: string[], permission: string}>}
+                * @public
                 */
-            get resources(): {
+            resources: {
                     id: any;
                     type: string;
                     actions: string[];
@@ -2373,33 +2349,24 @@ declare module '@ricado/api-client/Models/AccountPolicyModel' {
             /**
                 * The Rules this Policy provides
                 *
-                * @public
                 * @type {Object[]}
+                * @public
                 */
-            get rules(): any[];
+            rules: any[];
             /**
                 * Whether the Account Policy has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Account Policy was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * Convert this **AccountPolicyModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
     import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
@@ -2428,61 +2395,52 @@ declare module '@ricado/api-client/Models/ApiAccountModel' {
             /**
                 * The API Account ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * API Key
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get key(): string;
+            key: string | null;
             /**
                 * The API Account Name
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get name(): string;
+            name: string;
             /**
                 * The Company this API Account belongs to
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get companyId(): string;
+            companyId: string;
             /**
                 * The Policies that apply to this API Account
                 *
-                * @public
                 * @type {string[]}
+                * @public
                 */
-            get policies(): string[];
+            policies: string[];
             /**
                 * Whether the API Account has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the API Account was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * Convert this **ApiAccountModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
     import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
@@ -2524,47 +2482,38 @@ declare module '@ricado/api-client/Models/CompanyModel' {
             /**
                 * The Company ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Company Display Name
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get displayName(): string;
+            displayName: string;
             /**
                 * The Company Legal Name
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get legalName(): string;
+            legalName: string;
             /**
                 * Whether the Company has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Company was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * Convert this **CompanyModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
     import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
@@ -2593,68 +2542,59 @@ declare module '@ricado/api-client/Models/FirebaseTokenModel' {
             /**
                 * The Firebase Token ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Account this Firebase Token belongs to
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get accountId(): string;
+            accountId: string;
             /**
                 * The Firebase Token
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get token(): string;
+            token: string;
             /**
                 * Whether the Firebase Token should receive Notifications
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get enabled(): boolean;
+            enabled: boolean;
             /**
                 * The Device Name
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get deviceName(): string;
+            deviceName: string;
             /**
                 * The Device Platform
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get devicePlatform(): string;
+            devicePlatform: string;
             /**
                 * Whether the Firebase Token has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Firebase Token was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * Convert this **FirebaseTokenModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
     import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
@@ -2683,54 +2623,45 @@ declare module '@ricado/api-client/Models/RTUModel' {
             /**
                 * The RTU ID
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get id(): number;
+            id: number;
             /**
                 * The Site this RTU belongs to
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get siteId(): number;
+            siteId: number;
             /**
                 * The RTU Name
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get name(): string;
+            name: string;
             /**
                 * Whether the RTU is Enabled
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get enabled(): boolean;
+            enabled: boolean;
             /**
                 * Whether the RTU has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the RTU was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * Convert this **RTUModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
     import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
@@ -2759,47 +2690,38 @@ declare module '@ricado/api-client/Models/RTUPluginModel' {
             /**
                 * The RTU Plugin ID
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get id(): number;
+            id: number;
             /**
                 * The Plugin Name
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get name(): string;
+            name: string;
             /**
                 * The Company this RTU Plugin belongs to
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get companyId(): string;
+            companyId: string;
             /**
                 * Whether the RTU Plugin has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the RTU Plugin was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * Convert this **RTUPluginModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
     import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
@@ -2828,54 +2750,45 @@ declare module '@ricado/api-client/Models/SiteModel' {
             /**
                 * The Site ID
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get id(): number;
+            id: number;
             /**
                 * The Site Name
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get name(): string;
+            name: string;
             /**
                 * The Company this Site belongs to
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get companyId(): string;
+            companyId: string;
             /**
                 * Whether the Site is Enabled
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get enabled(): boolean;
+            enabled: boolean;
             /**
                 * Whether the Site has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Site was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * Convert this **SiteModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
     import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
@@ -2904,82 +2817,73 @@ declare module '@ricado/api-client/Models/TokenModel' {
             /**
                 * The Token ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Account this Token belongs to
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get accountId(): string;
+            accountId: string;
             /**
                 * The Account Type
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get accountType(): string;
+            accountType: string;
             /**
                 * When the Token was issued
                 *
-                * @public
                 * @type {Date}
+                * @public
                 */
-            get issueTimestamp(): Date;
+            issueTimestamp: Date;
             /**
                 * When the Token will expire
                 *
-                * @public
                 * @type {Date}
+                * @public
                 */
-            get expireTimestamp(): Date;
+            expireTimestamp: Date;
             /**
                 * When the last API call using this Token was made
                 *
-                * @public
                 * @type {?Date}
+                * @public
                 */
-            get activityTimestamp(): Date;
+            activityTimestamp: Date | null;
             /**
                 * When the Token was unlocked
                 *
-                * @public
                 * @type {?Date}
+                * @public
                 */
-            get unlockTimestamp(): Date;
+            unlockTimestamp: Date | null;
             /**
                 * When the Token was locked
                 *
-                * @public
                 * @type {?Date}
+                * @public
                 */
-            get lockTimestamp(): Date;
+            lockTimestamp: Date | null;
             /**
                 * Whether the Token has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Token was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * Convert this **TokenModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
     import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
@@ -3008,89 +2912,80 @@ declare module '@ricado/api-client/Models/UserAccountActionTokenModel' {
             /**
                 * The User Account Action Token ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Account this Action Token belongs to
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get accountId(): string;
+            accountId: string;
             /**
                 * The Company this Action Token belongs to
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get companyId(): string;
+            companyId: string;
             /**
                 * The Action that can be Performed using this Action Token
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get action(): string;
+            action: string;
             /**
                 * When the Action Token was issued
                 *
-                * @public
                 * @type {Date}
+                * @public
                 */
-            get issueTimestamp(): Date;
+            issueTimestamp: Date;
             /**
                 * When the Action Token will expire
                 *
-                * @public
                 * @type {Date}
+                * @public
                 */
-            get expireTimestamp(): Date;
+            expireTimestamp: Date;
             /**
                 * When the last API call using this Action Token was made
                 *
-                * @public
                 * @type {?Date}
+                * @public
                 */
-            get activityTimestamp(): Date;
+            activityTimestamp: Date | null;
             /**
                 * When the Action was Completed
                 *
-                * @public
                 * @type {?Date}
+                * @public
                 */
-            get completedTimestamp(): Date;
+            completedTimestamp: Date | null;
             /**
                 * When the Action Email was Sent
                 *
-                * @public
                 * @type {?Date}
+                * @public
                 */
-            get emailTimestamp(): Date;
+            emailTimestamp: Date | null;
             /**
                 * Whether the User Account Action Token has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the User Account Action Token was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * Convert this **UserAccountActionTokenModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
     import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
@@ -3119,82 +3014,73 @@ declare module '@ricado/api-client/Models/UserAccountModel' {
             /**
                 * The User Account ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The User's Email Address
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get email(): string;
+            email: string;
             /**
                 * The User's First Name
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get firstName(): string;
+            firstName: string | null;
             /**
                 * The User's Last Name
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get lastName(): string;
+            lastName: string | null;
             /**
                 * The Company this User belongs to
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get companyId(): string;
+            companyId: string;
             /**
                 * The Policies that apply to this User Account
                 *
-                * @public
                 * @type {string[]}
+                * @public
                 */
-            get policies(): string[];
+            policies: string[];
             /**
                 * Whether a Password has been Set for the User Account
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get hasPassword(): boolean;
+            hasPassword: boolean;
             /**
                 * Whether a Pin Code has been Set for the User Account
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get hasPinCode(): boolean;
+            hasPinCode: boolean;
             /**
                 * Whether the User Account has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the User Account was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * Convert this **UserAccountModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
     import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
@@ -3212,7 +3098,6 @@ declare module '@ricado/api-client/Models/Site' {
     namespace Site {
         export { AlarmGroupModel };
         export { AlarmModel };
-        export { BaseSiteModel };
         export { DefinitionModel };
         export { PermanentObjectDataModel };
         export { PermanentObjectModel };
@@ -3221,7 +3106,6 @@ declare module '@ricado/api-client/Models/Site' {
     }
     import AlarmGroupModel from "@ricado/api-client/Models/Site/AlarmGroupModel";
     import AlarmModel from "@ricado/api-client/Models/Site/AlarmModel";
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
     import DefinitionModel from "@ricado/api-client/Models/Site/DefinitionModel";
     import PermanentObjectDataModel from "@ricado/api-client/Models/Site/PermanentObjectDataModel";
     import PermanentObjectModel from "@ricado/api-client/Models/Site/PermanentObjectModel";
@@ -3229,21 +3113,6 @@ declare module '@ricado/api-client/Models/Site' {
     import TemporaryObjectModel from "@ricado/api-client/Models/Site/TemporaryObjectModel";
 }
 
-declare module '@ricado/api-client/Models/Site/BaseSiteModel' {
-    export default BaseSiteModel;
-    /**
-      * The Abstract **BaseSiteModel** Class
-      *
-      * @class
-      * @abstract
-      * @hideconstructor
-      * @extends BaseModel
-      */
-    class BaseSiteModel extends BaseModel {
-    }
-    import BaseModel from "@ricado/api-client/Models/BaseModel";
-}
-
 declare module '@ricado/api-client/Controllers/Packhouse/Site' {
     export default Site;
     namespace Site {
@@ -4860,98 +4729,74 @@ declare module '@ricado/api-client/Models/Site/AlarmGroupModel' {
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class AlarmGroupModel extends BaseSiteModel {
+    class AlarmGroupModel extends BaseModel {
             /**
                 * Create a new **AlarmGroupModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Alarm Group
                 * @return {AlarmGroupModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): AlarmGroupModel;
-            /**
-                * AlarmGroupModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Alarm Group
-                */
-            protected constructor();
+            } | string): AlarmGroupModel;
             /**
                 * The Alarm Group ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The RTU this Alarm Group belongs to
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get rtuId(): number;
+            rtuId: number | null;
             /**
                 * The Alarm Group Name
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get name(): string;
+            name: string;
             /**
                 * The Boolean Point used to Reset this Alarm Group
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get resetPoint(): number;
+            resetPoint: number;
             /**
                 * An Array of Points and the States to be Written when this Alarm Group is Reset
                 *
-                * @public
                 * @type {Array<{point: number, value: boolean}>}
+                * @public
                 */
-            get externalResetPoints(): {
+            externalResetPoints: {
                     point: number;
                     value: boolean;
             }[];
             /**
                 * Whether the Alarm Group has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Alarm Group was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Alarm Group
-                *
-                * @public
-                * @type {number}
-                */
-            get siteId(): number;
-            /**
-                * Convert this **AlarmGroupModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Site/AlarmModel' {
@@ -4961,165 +4806,141 @@ declare module '@ricado/api-client/Models/Site/AlarmModel' {
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class AlarmModel extends BaseSiteModel {
+    class AlarmModel extends BaseModel {
             /**
                 * Create a new **AlarmModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Alarm
                 * @return {AlarmModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): AlarmModel;
-            /**
-                * AlarmModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Alarm
-                */
-            protected constructor();
+            } | string): AlarmModel;
             /**
                 * The Alarm ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The RTU this Alarm belongs to
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get rtuId(): number;
+            rtuId: number | null;
             /**
                 * The Alarm Group this Alarm is a part of
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get groupId(): string;
+            groupId: string;
             /**
                 * The Alarm Name
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get name(): string;
+            name: string;
             /**
                 * Whether the Alarm is Critical or not
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get critical(): boolean;
+            critical: boolean;
             /**
                 * The Python Script with the Conditions to Trip this Alarm
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get tripScript(): string;
+            tripScript: string;
             /**
                 * The Python Script with the Conditions to Reset this Alarm
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get resetScript(): string;
+            resetScript: string | null;
             /**
                 * The Delay before this Alarm will Trip in Milliseconds
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get tripDelay(): number;
+            tripDelay: number;
             /**
                 * The Delay before this Alarm will Reset in Milliseconds
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get resetDelay(): number;
+            resetDelay: number;
             /**
                 * Whether the Alarm should Automatically Reset
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get autoReset(): boolean;
+            autoReset: boolean;
             /**
                 * The Delay before this Alarm should Auto Reset in Milliseconds
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get autoResetDelay(): number;
+            autoResetDelay: number;
             /**
                 * The Point used to store the Alarm Tripped State
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get trippedStatePoint(): number;
+            trippedStatePoint: number;
             /**
                 * The Point used to store the Alarm Tripped Timestamp
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get trippedTimestampPoint(): number;
+            trippedTimestampPoint: number;
             /**
                 * The Point used to store the Alarm's Internal Trip Start
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get internalTripStartPoint(): number;
+            internalTripStartPoint: number;
             /**
                 * The Point used to store the Alarm's Internal Reset Start
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get internalResetStartPoint(): number;
+            internalResetStartPoint: number;
             /**
                 * Whether the Alarm has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Alarm was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Alarm
-                *
-                * @public
-                * @type {number}
-                */
-            get siteId(): number;
-            /**
-                * Convert this **AlarmModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Site/DefinitionModel' {
@@ -5129,88 +4950,64 @@ declare module '@ricado/api-client/Models/Site/DefinitionModel' {
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class DefinitionModel extends BaseSiteModel {
+    class DefinitionModel extends BaseModel {
             /**
                 * Create a new **DefinitionModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Definition
                 * @return {DefinitionModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): DefinitionModel;
-            /**
-                * DefinitionModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Definition
-                */
-            protected constructor();
+            } | string): DefinitionModel;
             /**
                 * The Definition ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Definition Key Index
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get keyIndex(): string;
+            keyIndex: string;
             /**
                 * The Definition Type
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get type(): string;
+            type: string;
             /**
                 * The Definition Data
                 *
-                * @public
                 * @type {Object}
+                * @public
                 */
-            get data(): any;
+            data: any;
             /**
                 * Whether the Definition has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Definition was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Definition
-                *
-                * @public
-                * @type {number}
-                */
-            get siteId(): number;
-            /**
-                * Convert this **DefinitionModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Site/PermanentObjectDataModel' {
@@ -5220,102 +5017,78 @@ declare module '@ricado/api-client/Models/Site/PermanentObjectDataModel' {
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class PermanentObjectDataModel extends BaseSiteModel {
+    class PermanentObjectDataModel extends BaseModel {
             /**
                 * Create a new **PermanentObjectDataModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Permanent Object Data
                 * @return {PermanentObjectDataModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): PermanentObjectDataModel;
-            /**
-                * PermanentObjectDataModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Permanent Object Data
-                */
-            protected constructor();
+            } | string): PermanentObjectDataModel;
             /**
                 * The Permanent Object Data ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * An Optional Key Index for this Data
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get keyIndex(): string;
+            keyIndex: string;
             /**
                 * The Permanent Object this Data is related to
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get permanentObjectId(): string;
+            permanentObjectId: string;
             /**
                 * The Permanent Object Data Type
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get type(): string;
+            type: string;
             /**
                 * The Timestamp when this Data was Created
                 *
-                * @public
                 * @type {Date}
+                * @public
                 */
-            get timestamp(): Date;
+            timestamp: Date;
             /**
                 * The Data Object specific to this Permanent Object Data Type
                 *
-                * @public
                 * @type {Object}
+                * @public
                 */
-            get data(): any;
+            data: any;
             /**
                 * Whether the Permanent Object Data has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Permanent Object Data was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Permanent Object Data
-                *
-                * @public
-                * @type {number}
-                */
-            get siteId(): number;
-            /**
-                * Convert this **PermanentObjectDataModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Site/PermanentObjectModel' {
@@ -5325,95 +5098,71 @@ declare module '@ricado/api-client/Models/Site/PermanentObjectModel' {
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class PermanentObjectModel extends BaseSiteModel {
+    class PermanentObjectModel extends BaseModel {
             /**
                 * Create a new **PermanentObjectModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Permanent Object
                 * @return {PermanentObjectModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): PermanentObjectModel;
-            /**
-                * PermanentObjectModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Permanent Object
-                */
-            protected constructor();
+            } | string): PermanentObjectModel;
             /**
                 * The Permanent Object ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The RTU this Permanent Object belongs to
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get rtuId(): number;
+            rtuId: number | null;
             /**
                 * The Permanent Object Key Index
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get keyIndex(): string;
+            keyIndex: string;
             /**
                 * The Permanent Object Type
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get type(): string;
+            type: string;
             /**
                 * The Permanent Object Definition
                 *
-                * @public
                 * @type {Object}
+                * @public
                 */
-            get definition(): any;
+            definition: any;
             /**
                 * Whether the Permanent Object has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Permanent Object was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Permanent Object
-                *
-                * @public
-                * @type {number}
-                */
-            get siteId(): number;
-            /**
-                * Convert this **PermanentObjectModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Site/TemporaryObjectModel' {
@@ -5423,88 +5172,64 @@ declare module '@ricado/api-client/Models/Site/TemporaryObjectModel' {
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class TemporaryObjectModel extends BaseSiteModel {
+    class TemporaryObjectModel extends BaseModel {
             /**
                 * Create a new **TemporaryObjectModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Temporary Object
                 * @return {TemporaryObjectModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): TemporaryObjectModel;
-            /**
-                * TemporaryObjectModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Temporary Object
-                */
-            protected constructor();
+            } | string): TemporaryObjectModel;
             /**
                 * The Temporary Object ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Temporary Object Key Index
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get keyIndex(): string;
+            keyIndex: string;
             /**
                 * The Temporary Object Type
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get type(): string;
+            type: string;
             /**
                 * The Temporary Object Definition
                 *
-                * @public
                 * @type {Object}
+                * @public
                 */
-            get definition(): any;
+            definition: any;
             /**
                 * Whether the Temporary Object has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Temporary Object was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Temporary Object
-                *
-                * @public
-                * @type {number}
-                */
-            get siteId(): number;
-            /**
-                * Convert this **TemporaryObjectModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Controllers/Packhouse/Site/BinTipWeightController' {
@@ -10564,109 +10289,85 @@ declare module '@ricado/api-client/Models/Packhouse/Site/BinTipWeightModel' {
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class BinTipWeightModel extends BaseSiteModel {
+    class BinTipWeightModel extends BaseModel {
             /**
                 * Create a new **BinTipWeightModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Bin Tip Weight
                 * @return {BinTipWeightModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): BinTipWeightModel;
-            /**
-                * BinTipWeightModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Bin Tip Weight
-                */
-            protected constructor();
+            } | string): BinTipWeightModel;
             /**
                 * The Bin Tip Weight ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Bin Tip ID associated with this Bin Weight
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get binTipId(): string;
+            binTipId: string;
             /**
                 * The Packrun ID associated with this Bin Weight
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get packrunId(): string;
+            packrunId: string;
             /**
                 * When this Bin Weight was Created
                 *
-                * @public
                 * @type {Date}
+                * @public
                 */
-            get createdTimestamp(): Date;
+            createdTimestamp: Date;
             /**
                 * The Bin Weight Type
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get weightType(): string;
+            weightType: string;
             /**
                 * The Bin Weight
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get weight(): number;
+            weight: number;
             /**
                 * The Bin Scale ID associated with this Bin Weight
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get binScaleId(): string;
+            binScaleId: string | null;
             /**
                 * Whether the Bin Tip Weight has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Bin Tip Weight was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Bin Tip Weight
-                *
-                * @public
-                * @type {number}
-                */
-            get siteId(): number;
-            /**
-                * Convert this **BinTipWeightModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Packhouse/Site/CompacSizerBatchModel' {
@@ -10676,102 +10377,78 @@ declare module '@ricado/api-client/Models/Packhouse/Site/CompacSizerBatchModel'
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class CompacSizerBatchModel extends BaseSiteModel {
+    class CompacSizerBatchModel extends BaseModel {
             /**
                 * Create a new **CompacSizerBatchModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Compac Sizer Batch
                 * @return {CompacSizerBatchModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): CompacSizerBatchModel;
-            /**
-                * CompacSizerBatchModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Compac Sizer Batch
-                */
-            protected constructor();
+            } | string): CompacSizerBatchModel;
             /**
                 * The Compac Sizer Batch ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Compac Sizer ID this Batch is associated with
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get compacSizerId(): string;
+            compacSizerId: string;
             /**
                 * The Numeric Compac Batch ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get batchId(): string;
+            batchId: string;
             /**
                 * When this Batch was Created
                 *
-                * @public
                 * @type {Date}
+                * @public
                 */
-            get createdTimestamp(): Date;
+            createdTimestamp: Date;
             /**
                 * The Packrun ID associated with this Batch
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get packrunId(): string;
+            packrunId: string | null;
             /**
                 * The Compac Sizer Batch Data
                 *
-                * @public
                 * @type {Object}
+                * @public
                 */
-            get batch(): any;
+            batch: any;
             /**
                 * Whether the Compac Sizer Batch has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Compac Sizer Batch was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Compac Sizer Batch
-                *
-                * @public
-                * @type {number}
-                */
-            get siteId(): number;
-            /**
-                * Convert this **CompacSizerBatchModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Packhouse/Site/CompacSizerModel' {
@@ -10781,144 +10458,120 @@ declare module '@ricado/api-client/Models/Packhouse/Site/CompacSizerModel' {
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class CompacSizerModel extends BaseSiteModel {
+    class CompacSizerModel extends BaseModel {
             /**
                 * Create a new **CompacSizerModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Compac Sizer
                 * @return {CompacSizerModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): CompacSizerModel;
-            /**
-                * CompacSizerModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Compac Sizer
-                */
-            protected constructor();
+            } | string): CompacSizerModel;
             /**
                 * The Compac Sizer ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The RTU this Compac Sizer belongs to
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get rtuId(): number;
+            rtuId: number | null;
             /**
                 * The Compac Sizer Name
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get name(): string;
+            name: string;
             /**
                 * The Lanes defined for this Compac Sizer
                 *
-                * @public
                 * @type {Object[]}
+                * @public
                 */
-            get lanes(): any[];
+            lanes: any[];
             /**
                 * The Points used by this Compac Sizer
                 *
-                * @public
                 * @type {Object}
+                * @public
                 */
-            get points(): any;
+            points: any;
             /**
                 * The Outlets defined for this Compac Sizer
                 *
-                * @public
                 * @type {Object[]}
+                * @public
                 */
-            get outlets(): any[];
+            outlets: any[];
             /**
                 * The Sizer Type
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get sizerType(): string;
+            sizerType: string;
             /**
                 * The Auto Create Batch Delay in Seconds for this Compac Sizer
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get autoCreateBatchDelay(): number;
+            autoCreateBatchDelay: number;
             /**
                 * The Fruit Sizes defined and handled by this Compac Sizer
                 *
-                * @public
                 * @type {Object[]}
+                * @public
                 */
-            get fruitSizes(): any[];
+            fruitSizes: any[];
             /**
                 * The Packing Line ID this Compac Sizer belongs to
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get packingLineId(): string;
+            packingLineId: string;
             /**
                 * The FreshPack Integration Configuration for this Compac Sizer
                 *
-                * @public
                 * @type {?Object}
+                * @public
                 */
-            get freshPackIntegration(): any;
+            freshPackIntegration: any | null;
             /**
                 * An Array of Sources that deliver Fruit to this Compac Sizer
                 *
-                * @public
                 * @type {Object[]}
+                * @public
                 */
-            get sources(): any[];
+            sources: any[];
             /**
                 * Whether the Compac Sizer has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Compac Sizer was last updated
                 *
-                * @public
                 * @type {Date}
+                * @public
                 */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Compac Sizer
-                *
-                * @public
-                * @type {number}
-                */
-            get siteId(): number;
-            /**
-                * Convert this **CompacSizerModel** to a JSON Object
-                *
-                * @public
-                * @return {Object<string, any>}
-                */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Packhouse/Site/CompacSizerOutletProductChangeModel' {
@@ -10928,116 +10581,92 @@ declare module '@ricado/api-client/Models/Packhouse/Site/CompacSizerOutletProduc
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class CompacSizerOutletProductChangeModel extends BaseSiteModel {
+    class CompacSizerOutletProductChangeModel extends BaseModel {
             /**
                 * Create a new **CompacSizerOutletProductChangeModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Compac Sizer Outlet Product Change
                 * @return {CompacSizerOutletProductChangeModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): CompacSizerOutletProductChangeModel;
-            /**
-                * CompacSizerOutletProductChangeModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Compac Sizer Outlet Product Change
-                */
-            protected constructor();
+            } | string): CompacSizerOutletProductChangeModel;
             /**
                 * The Compac Sizer Outlet Product Change ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Compac Sizer ID this Outlet Change is associated with
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get compacSizerId(): string;
+            compacSizerId: string;
             /**
                 * The Sizer Outlet Number this Outlet Change is associated with
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get outletNumber(): string;
+            outletNumber: string;
             /**
                 * When this Outlet Change occurred
                 *
-                * @public
                 * @type {Date}
+                * @public
                 */
-            get createdTimestamp(): Date;
+            createdTimestamp: Date;
             /**
                 * The ID of the Previous Product that was active on the Outlet
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get previousProductId(): string;
+            previousProductId: string | null;
             /**
                 * The Name of the Previous Product that was active on the Outlet
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get previousProductName(): string;
+            previousProductName: string | null;
             /**
                 * The ID of the New Product that is now active on the Outlet
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get newProductId(): string;
+            newProductId: string;
             /**
                 * The Name of the New Product that is now active on the Outlet
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get newProductName(): string;
+            newProductName: string;
             /**
                 * Whether the Compac Sizer Outlet Product Change has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Compac Sizer Outlet Product Change was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Compac Sizer Outlet Product Change
-                *
-                * @public
-                * @type {number}
-                */
-            get siteId(): number;
-            /**
-                * Convert this **CompacSizerOutletProductChangeModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Packhouse/Site/CompacSizerOutletTypeChangeModel' {
@@ -11047,102 +10676,78 @@ declare module '@ricado/api-client/Models/Packhouse/Site/CompacSizerOutletTypeCh
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class CompacSizerOutletTypeChangeModel extends BaseSiteModel {
+    class CompacSizerOutletTypeChangeModel extends BaseModel {
             /**
                 * Create a new **CompacSizerOutletTypeChangeModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Compac Sizer Outlet Type Change
                 * @return {CompacSizerOutletTypeChangeModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): CompacSizerOutletTypeChangeModel;
-            /**
-                * CompacSizerOutletTypeChangeModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Compac Sizer Outlet Type Change
-                */
-            protected constructor();
+            } | string): CompacSizerOutletTypeChangeModel;
             /**
                 * The Compac Sizer Outlet Type Change ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Compac Sizer ID this Outlet Type Change is associated with
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get compacSizerId(): string;
+            compacSizerId: string;
             /**
                 * The Sizer Outlet Number this Outlet Type Change is associated with
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get outletNumber(): string;
+            outletNumber: string;
             /**
                 * When this Outlet Type Change occurred
                 *
-                * @public
                 * @type {Date}
+                * @public
                 */
-            get createdTimestamp(): Date;
+            createdTimestamp: Date;
             /**
                 * The ID of the Previous Type that was active on the Outlet
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get previousTypeId(): string;
+            previousTypeId: string | null;
             /**
                 * The ID of the New Type that is now active on the Outlet
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get newTypeId(): string;
+            newTypeId: string;
             /**
                 * Whether the Compac Sizer Outlet Type Change has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Compac Sizer Outlet Type Change was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Compac Sizer Outlet Type Change
-                *
                 * @public
-                * @type {number}
                 */
-            get siteId(): number;
-            /**
-                * Convert this **CompacSizerOutletTypeChangeModel** to a JSON Object
-                *
-                * @public
-                * @return {Object<string, any>}
-                */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Packhouse/Site/CompacSizerOutletTypeModel' {
@@ -11152,88 +10757,64 @@ declare module '@ricado/api-client/Models/Packhouse/Site/CompacSizerOutletTypeMo
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class CompacSizerOutletTypeModel extends BaseSiteModel {
+    class CompacSizerOutletTypeModel extends BaseModel {
             /**
                 * Create a new **CompacSizerOutletTypeModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Compac Sizer Outlet Type
                 * @return {CompacSizerOutletTypeModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): CompacSizerOutletTypeModel;
-            /**
-                * CompacSizerOutletTypeModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Compac Sizer Outlet Type
-                */
-            protected constructor();
+            } | string): CompacSizerOutletTypeModel;
             /**
                 * The Compac Sizer Outlet Type ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Name for this Dynamic Outlet Type
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get name(): string;
+            name: string;
             /**
                 * The Generic Outlet Type
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get type(): string;
+            type: string;
             /**
                 * An Optional Description for this Dynamic Outlet Type
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get description(): string;
+            description: string;
             /**
                 * Whether the Compac Sizer Outlet Type has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Compac Sizer Outlet Type was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Compac Sizer Outlet Type
-                *
                 * @public
-                * @type {number}
                 */
-            get siteId(): number;
-            /**
-                * Convert this **CompacSizerOutletTypeModel** to a JSON Object
-                *
-                * @public
-                * @return {Object<string, any>}
-                */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Packhouse/Site/CompacSizerPackrunSummaryModel' {
@@ -11243,89 +10824,81 @@ declare module '@ricado/api-client/Models/Packhouse/Site/CompacSizerPackrunSumma
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class CompacSizerPackrunSummaryModel extends BaseSiteModel {
+    class CompacSizerPackrunSummaryModel extends BaseModel {
             /**
                 * Create a new **CompacSizerPackrunSummaryModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Compac Sizer Packrun Summary
                 * @return {CompacSizerPackrunSummaryModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): CompacSizerPackrunSummaryModel;
-            /**
-                * CompacSizerPackrunSummaryModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Compac Sizer Packrun Summary
-                */
-            protected constructor();
+            } | string): CompacSizerPackrunSummaryModel;
             /**
                 * The Compac Sizer Packrun Summary ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Compac Sizer ID this Summary is associated with
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get compacSizerId(): string;
+            compacSizerId: string;
             /**
                 * The Packrun ID this Summary is associated with
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get packrunId(): string;
+            packrunId: string;
             /**
                 * When this Summary was Created
                 *
-                * @public
                 * @type {Date}
+                * @public
                 */
-            get createdTimestamp(): Date;
+            createdTimestamp: Date;
             /**
                 * The Time Batch this Summary is associated with
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get timeBatchId(): string;
+            timeBatchId: string | null;
             /**
                 * An Array of Packrun Summary Data Objects for each Outlet
                 *
-                * @public
                 * @type {Array<{name: string, type: string, number: number, totals: Array<{classType: ?string, fruitSize: string, packType: ?string, weight: number, fruitCount: number, packCount: ?number}>}>}
+                * @public
                 */
-            get outletSummaries(): {
+            outletSummaries: {
                     name: string;
                     type: string;
                     number: number;
-                    totals: Array<{
+                    totals: {
                             classType: string | null;
                             fruitSize: string;
                             packType: string | null;
                             weight: number;
                             fruitCount: number;
                             packCount: number | null;
-                    }>;
+                    }[];
             }[];
             /**
                 * An Array that contains the Products initially Assigned to each Outlet
                 *
-                * @public
                 * @type {Array<{outletNumber: number, productId: string, productName: ?string}>}
+                * @public
                 */
-            get initialOutletProducts(): {
+            initialOutletProducts: {
                     outletNumber: number;
                     productId: string;
                     productName: string | null;
@@ -11333,10 +10906,10 @@ declare module '@ricado/api-client/Models/Packhouse/Site/CompacSizerPackrunSumma
             /**
                 * An Array of Outlet Product Changes
                 *
-                * @public
                 * @type {Array<{timestamp: Date, outletNumber: number, productId: string, productName: ?string, outletProductChangeId: string}>}
+                * @public
                 */
-            get outletProductChanges(): {
+            outletProductChanges: {
                     timestamp: Date;
                     outletNumber: number;
                     productId: string;
@@ -11346,10 +10919,10 @@ declare module '@ricado/api-client/Models/Packhouse/Site/CompacSizerPackrunSumma
             /**
                 * An Array that contains the Types initially configured for each Outlet
                 *
-                * @public
                 * @type {Array<{outletNumber: number, type: string, typeId: ?string}>}
+                * @public
                 */
-            get initialOutletTypes(): {
+            initialOutletTypes: {
                     outletNumber: number;
                     type: string;
                     typeId: string | null;
@@ -11357,10 +10930,10 @@ declare module '@ricado/api-client/Models/Packhouse/Site/CompacSizerPackrunSumma
             /**
                 * An Array of Outlet Type Changes. Only applies to Outlets configured as *Dynamic*
                 *
-                * @public
                 * @type {Array<{timestamp: Date, outletNumber: number, typeId: ?string}>}
+                * @public
                 */
-            get outletTypeChanges(): {
+            outletTypeChanges: {
                     timestamp: Date;
                     outletNumber: number;
                     typeId: string | null;
@@ -11368,35 +10941,19 @@ declare module '@ricado/api-client/Models/Packhouse/Site/CompacSizerPackrunSumma
             /**
                 * Whether the Compac Sizer Packrun Summary has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Compac Sizer Packrun Summary was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Compac Sizer Packrun Summary
-                *
                 * @public
-                * @type {number}
                 */
-            get siteId(): number;
-            /**
-                * Convert this **CompacSizerPackrunSummaryModel** to a JSON Object
-                *
-                * @public
-                * @return {Object<string, any>}
-                */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Packhouse/Site/DowntimeEventModel' {
@@ -11406,144 +10963,120 @@ declare module '@ricado/api-client/Models/Packhouse/Site/DowntimeEventModel' {
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class DowntimeEventModel extends BaseSiteModel {
+    class DowntimeEventModel extends BaseModel {
             /**
                 * Create a new **DowntimeEventModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Downtime Event
                 * @return {DowntimeEventModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): DowntimeEventModel;
-            /**
-                * DowntimeEventModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Downtime Event
-                */
-            protected constructor();
+            } | string): DowntimeEventModel;
             /**
                 * The Downtime Event ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Packing Line ID this Downtime Event is associated with
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get packingLineId(): string;
+            packingLineId: string;
             /**
                 * The Shift ID this Downtime Event is asssociated with
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get shiftId(): string;
+            shiftId: string;
             /**
                 * When this Downtime Event was Created
                 *
-                * @public
                 * @type {Date}
+                * @public
                 */
-            get createdTimestamp(): Date;
+            createdTimestamp: Date;
             /**
                 * When this Downtime Event Started
                 *
-                * @public
                 * @type {Date}
+                * @public
                 */
-            get startTimestamp(): Date;
+            startTimestamp: Date;
             /**
                 * When this Downtime Event Ended
                 *
-                * @public
                 * @type {?Date}
+                * @public
                 */
-            get endTimestamp(): Date;
+            endTimestamp: Date | null;
             /**
                 * The Reason Category for this Downtime Event
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get reasonCategory(): string;
+            reasonCategory: string | null;
             /**
                 * The Reason Tag for this Downtime Event
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get reasonTag(): string;
+            reasonTag: string | null;
             /**
                 * An Optional Summary of the Action taken to Remedy this Downtime Event
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get remedyAction(): string;
+            remedyAction: string | null;
             /**
                 * An Optional Rating between 1 and 10 on how likely this Downtime Event could have been Avoided
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get avoidableRating(): number;
+            avoidableRating: number | null;
             /**
                 * The Source which Created this Downtime Event
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get source(): string;
+            source: string;
             /**
                 * The Status of this Downtime Event
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get status(): string;
+            status: string;
             /**
                 * Whether the Downtime Event has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Downtime Event was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Downtime Event
-                *
-                * @public
-                * @type {number}
-                */
-            get siteId(): number;
-            /**
-                * Convert this **DowntimeEventModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Packhouse/Site/FreshPackPackrunSummaryModel' {
@@ -11553,102 +11086,78 @@ declare module '@ricado/api-client/Models/Packhouse/Site/FreshPackPackrunSummary
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class FreshPackPackrunSummaryModel extends BaseSiteModel {
+    class FreshPackPackrunSummaryModel extends BaseModel {
             /**
                 * Create a new **FreshPackPackrunSummaryModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this FreshPack Packrun Summary
                 * @return {FreshPackPackrunSummaryModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): FreshPackPackrunSummaryModel;
-            /**
-                * FreshPackPackrunSummaryModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this FreshPack Packrun Summary
-                */
-            protected constructor();
+            } | string): FreshPackPackrunSummaryModel;
             /**
                 * The FreshPack Packrun Summary ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Packing Line ID this Summary is associated with
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get packingLineId(): string;
+            packingLineId: string;
             /**
                 * The Packrun ID this Summary is associated with
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get packrunId(): string;
+            packrunId: string;
             /**
                 * When this Summary was Created
                 *
-                * @public
                 * @type {Date}
+                * @public
                 */
-            get createdTimestamp(): Date;
+            createdTimestamp: Date;
             /**
                 * The Time Batch this Summary is associated with
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get timeBatchId(): string;
+            timeBatchId: string | null;
             /**
                 * An Array of Tray Summary Data Objects for all Sizes and Class Types
                 *
-                * @public
                 * @type {Object[]}
+                * @public
                 */
-            get traySummaries(): any[];
+            traySummaries: any[];
             /**
                 * Whether the FreshPack Packrun Summary has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the FreshPack Packrun Summary was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this FreshPack Packrun Summary
-                *
                 * @public
-                * @type {number}
                 */
-            get siteId(): number;
-            /**
-                * Convert this **FreshPackPackrunSummaryModel** to a JSON Object
-                *
-                * @public
-                * @return {Object<string, any>}
-                */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Packhouse/Site/GrowingMethodModel' {
@@ -11658,88 +11167,64 @@ declare module '@ricado/api-client/Models/Packhouse/Site/GrowingMethodModel' {
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class GrowingMethodModel extends BaseSiteModel {
+    class GrowingMethodModel extends BaseModel {
             /**
                 * Create a new **GrowingMethodModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Growing Method
                 * @return {GrowingMethodModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): GrowingMethodModel;
-            /**
-                * GrowingMethodModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Growing Method
-                */
-            protected constructor();
+            } | string): GrowingMethodModel;
             /**
                 * The Growing Method ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Growing Method Code
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get code(): string;
+            code: string;
             /**
                 * The Growing Method Name
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get name(): string;
+            name: string;
             /**
                 * The Growing Method Description
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get description(): string;
+            description: string;
             /**
                 * Whether the Growing Method has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Growing Method was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Growing Method
-                *
                 * @public
-                * @type {number}
                 */
-            get siteId(): number;
-            /**
-                * Convert this **GrowingMethodModel** to a JSON Object
-                *
-                * @public
-                * @return {Object<string, any>}
-                */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Packhouse/Site/PackTypeModel' {
@@ -11749,105 +11234,81 @@ declare module '@ricado/api-client/Models/Packhouse/Site/PackTypeModel' {
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class PackTypeModel extends BaseSiteModel {
+    class PackTypeModel extends BaseModel {
             /**
                 * Create a new **PackTypeModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Pack Type
                 * @return {PackTypeModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): PackTypeModel;
-            /**
-                * PackTypeModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Pack Type
-                */
-            protected constructor();
+            } | string): PackTypeModel;
             /**
                 * The Pack Type ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Code for this Pack Type
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get code(): string;
+            code: string;
             /**
                 * The Name for this Pack Type
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get name(): string;
+            name: string;
             /**
                 * An Optional Description for this Pack Type
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get description(): string;
+            description: string;
             /**
                 * The Physical Form of this Pack Type
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get form(): string;
+            form: string;
             /**
                 * An Array of Fruit Sizes Defined for this Pack Type
                 *
-                * @public
                 * @type {Array<{size: string, count: number}>}
+                * @public
                 */
-            get fruitSizes(): {
+            fruitSizes: {
                     size: string;
                     count: number;
             }[];
             /**
                 * Whether the Pack Type has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Pack Type was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Pack Type
-                *
                 * @public
-                * @type {number}
                 */
-            get siteId(): number;
-            /**
-                * Convert this **PackTypeModel** to a JSON Object
-                *
-                * @public
-                * @return {Object<string, any>}
-                */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Packhouse/Site/PackingLineModel' {
@@ -11857,105 +11318,97 @@ declare module '@ricado/api-client/Models/Packhouse/Site/PackingLineModel' {
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class PackingLineModel extends BaseSiteModel {
+    class PackingLineModel extends BaseModel {
             /**
                 * Create a new **PackingLineModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Packing Line
                 * @return {PackingLineModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): PackingLineModel;
-            /**
-                * PackingLineModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Packing Line
-                */
-            protected constructor();
+            } | string): PackingLineModel;
             /**
                 * The Packing Line ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The RTU this Packing Line belongs to
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get rtuId(): number;
+            rtuId: number | null;
             /**
                 * The Packing Line Name
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get name(): string;
+            name: string;
             /**
                 * The Points used by this Packing Line
                 *
-                * @public
                 * @type {Object}
+                * @public
                 */
-            get points(): any;
+            points: any;
             /**
                 * The Sizer Objects that belong to this Packing Line
                 *
-                * @public
                 * @type {Object[]}
+                * @public
                 */
-            get sizers(): any[];
+            sizers: any[];
             /**
                 * The Bin Tip Objects that belong to this this Packing Line
                 *
-                * @public
                 * @type {Object[]}
+                * @public
                 */
-            get binTips(): any[];
+            binTips: any[];
             /**
                 * The Reject Bin Scale Objects that belong to this Packing Line
                 *
-                * @public
                 * @type {Object[]}
+                * @public
                 */
-            get rejectBinScales(): any[];
+            rejectBinScales: any[];
             /**
                 * The Automation Object for this Packing Line
                 *
-                * @public
                 * @type {?Object}
+                * @public
                 */
-            get automation(): any;
+            automation: any | null;
             /**
                 * The Alarm Groups that are used by this Packing Line
                 *
-                * @public
                 * @type {string[]}
+                * @public
                 */
-            get alarmGroups(): string[];
+            alarmGroups: string[];
             /**
                 * The Class Types that are defined for this Packing Line
                 *
-                * @public
                 * @type {Object[]}
+                * @public
                 */
-            get classTypes(): any[];
+            classTypes: any[];
             /**
                 * The Optional Shift Management Object for this Packing Line
                 *
-                * @public
                 * @type {?{points: {currentShiftId: number, createNewDayShiftRequest: number, createNewNightShiftRequest: number, startCurrentShiftRequest: number, finishCurrentShiftRequest: number, currentFocusMeetingId: number, startFocusMeetingRequest: number, finishFocusMeetingRequest: number, shiftSchedules: number}, enabled: boolean}}
+                * @public
                 */
-            get shiftManagement(): {
+            shiftManagement: {
                     points: {
                             currentShiftId: number;
                             createNewDayShiftRequest: number;
@@ -11972,49 +11425,33 @@ declare module '@ricado/api-client/Models/Packhouse/Site/PackingLineModel' {
             /**
                 * The FreshPack Integration Configuration for this Packing Line
                 *
-                * @public
                 * @type {?Object}
+                * @public
                 */
-            get freshPackIntegration(): any;
+            freshPackIntegration: any | null;
             /**
                 * The FreshQuality Integration Configuration for this Packing Line
                 *
-                * @public
                 * @type {?Object}
+                * @public
                 */
-            get freshQualityIntegration(): any;
+            freshQualityIntegration: any | null;
             /**
                 * Whether the Packing Line has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Packing Line was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Packing Line
-                *
                 * @public
-                * @type {number}
                 */
-            get siteId(): number;
-            /**
-                * Convert this **PackingLineModel** to a JSON Object
-                *
-                * @public
-                * @return {Object<string, any>}
-                */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Packhouse/Site/PackrunModel' {
@@ -12024,151 +11461,127 @@ declare module '@ricado/api-client/Models/Packhouse/Site/PackrunModel' {
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class PackrunModel extends BaseSiteModel {
+    class PackrunModel extends BaseModel {
             /**
                 * Create a new **PackrunModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Packrun
                 * @return {PackrunModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): PackrunModel;
-            /**
-                * PackrunModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Packrun
-                */
-            protected constructor();
+            } | string): PackrunModel;
             /**
                 * The Packrun ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Packing Line ID this Packrun is associated with
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get packingLineId(): string;
+            packingLineId: string;
             /**
                 * The Packrun Name
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get name(): string;
+            name: string;
             /**
                 * When this Packrun was Created
                 *
-                * @public
                 * @type {Date}
+                * @public
                 */
-            get createdTimestamp(): Date;
+            createdTimestamp: Date;
             /**
                 * The Grower Name for this Packrun
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get growerName(): string;
+            growerName: string;
             /**
                 * The Grower Code for this Packrun
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get growerCode(): string;
+            growerCode: string;
             /**
                 * The Maturity Area for this Packrun
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get maturityArea(): string;
+            maturityArea: string;
             /**
                 * When this Packrun was Started
                 *
-                * @public
                 * @type {?Date}
+                * @public
                 */
-            get startTimestamp(): Date;
+            startTimestamp: Date | null;
             /**
                 * When this Packrun was Finished
                 *
-                * @public
                 * @type {?Date}
+                * @public
                 */
-            get finishTimestamp(): Date;
+            finishTimestamp: Date | null;
             /**
                 * The Variety for this Packrun
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get varietyId(): string;
+            varietyId: string;
             /**
                 * The Growing Method for this Packrun
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get growingMethodId(): string;
+            growingMethodId: string | null;
             /**
                 * The Number of Allocated Bins for this Packrun
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get allocatedBins(): number;
+            allocatedBins: number;
             /**
                 * The Time Batches for this Packrun
                 *
-                * @public
                 * @type {Object[]}
+                * @public
                 */
-            get timeBatches(): any[];
+            timeBatches: any[];
             /**
                 * Whether the Packrun has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Packrun was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Packrun
-                *
                 * @public
-                * @type {number}
                 */
-            get siteId(): number;
-            /**
-                * Convert this **PackrunModel** to a JSON Object
-                *
-                * @public
-                * @return {Object<string, any>}
-                */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Packhouse/Site/RejectBinModel' {
@@ -12178,109 +11591,85 @@ declare module '@ricado/api-client/Models/Packhouse/Site/RejectBinModel' {
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class RejectBinModel extends BaseSiteModel {
+    class RejectBinModel extends BaseModel {
             /**
                 * Create a new **RejectBinModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Reject Bin
                 * @return {RejectBinModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): RejectBinModel;
-            /**
-                * RejectBinModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Reject Bin
-                */
-            protected constructor();
+            } | string): RejectBinModel;
             /**
                 * The Reject Bin ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Reject Bin Scale ID this Reject Bin is associated with
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get rejectBinScaleId(): string;
+            rejectBinScaleId: string;
             /**
                 * When this Reject Bin was Created
                 *
-                * @public
                 * @type {Date}
+                * @public
                 */
-            get createdTimestamp(): Date;
+            createdTimestamp: Date;
             /**
                 * The Name of the Reject Bin Scale where this Bin was Created
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get rejectBinScaleName(): string;
+            rejectBinScaleName: string;
             /**
                 * The Tare Weight Captured by the Reject Bin Scale
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get tareWeight(): number;
+            tareWeight: number | null;
             /**
                 * When this Reject Bin was Finalized (No new Weights)
                 *
-                * @public
                 * @type {?Date}
+                * @public
                 */
-            get finalizedTimestamp(): Date;
+            finalizedTimestamp: Date | null;
             /**
                 * The Multi-Grower Bins that will be submitted to FreshPack
                 *
-                * @public
                 * @type {Object[]}
+                * @public
                 */
-            get freshPackMultiGrowerBins(): any[];
+            freshPackMultiGrowerBins: any[];
             /**
                 * Whether the Reject Bin has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Reject Bin was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Reject Bin
-                *
-                * @public
-                * @type {number}
-                */
-            get siteId(): number;
-            /**
-                * Convert this **RejectBinModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Packhouse/Site/RejectBinScaleModel' {
@@ -12290,130 +11679,106 @@ declare module '@ricado/api-client/Models/Packhouse/Site/RejectBinScaleModel' {
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class RejectBinScaleModel extends BaseSiteModel {
+    class RejectBinScaleModel extends BaseModel {
             /**
                 * Create a new **RejectBinScaleModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Reject Bin Scale
                 * @return {RejectBinScaleModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): RejectBinScaleModel;
-            /**
-                * RejectBinScaleModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Reject Bin Scale
-                */
-            protected constructor();
+            } | string): RejectBinScaleModel;
             /**
                 * The Reject Bin Scale ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The RTU this Reject Bin Scale belongs to
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get rtuId(): number;
+            rtuId: number | null;
             /**
                 * The Name of this Reject Bin Scale
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get name(): string;
+            name: string;
             /**
                 * The Points used by this Reject Bin Scale
                 *
-                * @public
                 * @type {Object}
+                * @public
                 */
-            get points(): any;
+            points: any;
             /**
                 * The Packing Line that owns this Reject Bin Scale
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get packingLineId(): string;
+            packingLineId: string;
             /**
                 * The Permanent Object that provides the Next Packrun for this Reject Bin Scale
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get packrunSourceId(): string;
+            packrunSourceId: string | null;
             /**
                 * The Packrun Group this Reject Bin Scale is a part of
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get packrunGroup(): number;
+            packrunGroup: number | null;
             /**
                 * An Array of Sources that deliver Fruit to this Reject Bin Scale
                 *
-                * @public
                 * @type {Object[]}
-                */
-            get sources(): any[];
-            /**
-                * The Auto Packrun Change Configuration for this Reject Bin Scale
-                *
                 * @public
-                * @type {?number}
                 */
-            get autoPackrunChange(): number;
+            sources: any[];
             /**
-                * The FreshPack Integration Configuration for this Reject Bin Scale
-                *
-                * @public
-                * @type {?Object}
-                */
-            get freshPackIntegration(): any;
-            /**
-                * Whether the Reject Bin Scale has been deleted
+                * The Auto Packrun Change Configuration for this Reject Bin Scale
                 *
+                * @type {?number}
                 * @public
-                * @type {boolean}
                 */
-            get deleted(): boolean;
+            autoPackrunChange: number | null;
             /**
-                * When the Reject Bin Scale was last updated
+                * The FreshPack Integration Configuration for this Reject Bin Scale
                 *
+                * @type {?Object}
                 * @public
-                * @type {Date}
                 */
-            get updateTimestamp(): Date;
+            freshPackIntegration: any | null;
             /**
-                * The Site ID associated with this Reject Bin Scale
+                * Whether the Reject Bin Scale has been deleted
                 *
+                * @type {boolean}
                 * @public
-                * @type {number}
                 */
-            get siteId(): number;
+            deleted: boolean;
             /**
-                * Convert this **RejectBinScaleModel** to a JSON Object
+                * When the Reject Bin Scale was last updated
                 *
+                * @type {Date}
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Packhouse/Site/RejectBinWeightModel' {
@@ -12423,116 +11788,92 @@ declare module '@ricado/api-client/Models/Packhouse/Site/RejectBinWeightModel' {
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class RejectBinWeightModel extends BaseSiteModel {
+    class RejectBinWeightModel extends BaseModel {
             /**
                 * Create a new **RejectBinWeightModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Reject Bin Weight
                 * @return {RejectBinWeightModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): RejectBinWeightModel;
-            /**
-                * RejectBinWeightModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Reject Bin Weight
-                */
-            protected constructor();
+            } | string): RejectBinWeightModel;
             /**
                 * The Reject Bin Weight ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Reject Bin Scale ID this Reject Weight is associated with
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get rejectBinScaleId(): string;
+            rejectBinScaleId: string;
             /**
                 * The Reject Bin ID this Reject Weight is associated with
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get rejectBinId(): string;
+            rejectBinId: string;
             /**
                 * When this Reject Bin Weight was Created
                 *
-                * @public
                 * @type {Date}
+                * @public
                 */
-            get createdTimestamp(): Date;
+            createdTimestamp: Date;
             /**
                 * The Packrun this Reject Weight is associated with
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get packrunId(): string;
+            packrunId: string | null;
             /**
                 * The Net Weight Captured by the Reject Bin Scale
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get netWeight(): number;
+            netWeight: number;
             /**
                 * The Source Weights that make up the Net Weight
                 *
-                * @public
                 * @type {Object[]}
+                * @public
                 */
-            get sources(): any[];
+            sources: any[];
             /**
                 * The Multi-Grower Bin Weights that will be submitted to FreshPack
                 *
-                * @public
                 * @type {Object[]}
+                * @public
                 */
-            get freshPackMultiGrowerBinWeights(): any[];
+            freshPackMultiGrowerBinWeights: any[];
             /**
                 * Whether the Reject Bin Weight has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Reject Bin Weight was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Reject Bin Weight
-                *
                 * @public
-                * @type {number}
-                */
-            get siteId(): number;
-            /**
-                * Convert this **RejectBinWeightModel** to a JSON Object
-                *
-                * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Packhouse/Site/ShiftFocusMeetingModel' {
@@ -12542,130 +11883,106 @@ declare module '@ricado/api-client/Models/Packhouse/Site/ShiftFocusMeetingModel'
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class ShiftFocusMeetingModel extends BaseSiteModel {
+    class ShiftFocusMeetingModel extends BaseModel {
             /**
                 * Create a new **ShiftFocusMeetingModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Shift Focus Meeting
                 * @return {ShiftFocusMeetingModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): ShiftFocusMeetingModel;
-            /**
-                * ShiftFocusMeetingModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Shift Focus Meeting
-                */
-            protected constructor();
+            } | string): ShiftFocusMeetingModel;
             /**
                 * The Shift Focus Meeting ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Packing Line ID this Focus Meeting is associated with
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get packingLineId(): string;
+            packingLineId: string;
             /**
                 * The Shift ID this Focus Meeting is asssociated with
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get shiftId(): string;
+            shiftId: string;
             /**
                 * When this Focus Meeting was Created
                 *
-                * @public
                 * @type {Date}
+                * @public
                 */
-            get createdTimestamp(): Date;
+            createdTimestamp: Date;
             /**
                 * When this Focus Meeting is Scheduled to Begin
                 *
-                * @public
                 * @type {Date}
+                * @public
                 */
-            get scheduledTimestamp(): Date;
+            scheduledTimestamp: Date;
             /**
                 * When this Focus Meeting was Started
                 *
-                * @public
                 * @type {?Date}
+                * @public
                 */
-            get startTimestamp(): Date;
+            startTimestamp: Date | null;
             /**
                 * When this Focus Meeting was Completed
                 *
-                * @public
                 * @type {?Date}
+                * @public
                 */
-            get finishTimestamp(): Date;
+            finishTimestamp: Date | null;
             /**
                 * An Optional Key Focus until the Next Meeting
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get nextKeyFocus(): string;
+            nextKeyFocus: string | null;
             /**
                 * An Optional Rating between 1 and 10 on how Successful the Focus Meeting was
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get successRating(): number;
+            successRating: number | null;
             /**
                 * The Status of this Focus Meeting
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get status(): string;
+            status: string;
             /**
                 * Whether the Shift Focus Meeting has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Shift Focus Meeting was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Shift Focus Meeting
-                *
-                * @public
-                * @type {number}
-                */
-            get siteId(): number;
-            /**
-                * Convert this **ShiftFocusMeetingModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Packhouse/Site/ShiftHourlyEntryModel' {
@@ -12675,119 +11992,111 @@ declare module '@ricado/api-client/Models/Packhouse/Site/ShiftHourlyEntryModel'
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class ShiftHourlyEntryModel extends BaseSiteModel {
+    class ShiftHourlyEntryModel extends BaseModel {
             /**
                 * Create a new **ShiftHourlyEntryModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Shift Hourly Entry
                 * @return {ShiftHourlyEntryModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): ShiftHourlyEntryModel;
-            /**
-                * ShiftHourlyEntryModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Shift Hourly Entry
-                */
-            protected constructor();
+            } | string): ShiftHourlyEntryModel;
             /**
                 * The Shift Hourly Entry ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Packing Line ID this Hourly Entry is associated with
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get packingLineId(): string;
+            packingLineId: string;
             /**
                 * The Shift ID this Hourly Entry is asssociated with
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get shiftId(): string;
+            shiftId: string;
             /**
                 * When this Hourly Entry was Created
                 *
-                * @public
                 * @type {Date}
+                * @public
                 */
-            get createdTimestamp(): Date;
+            createdTimestamp: Date;
             /**
                 * The Start Timestamp of this Hourly Entry
                 *
-                * @public
                 * @type {Date}
+                * @public
                 */
-            get startTimestamp(): Date;
+            startTimestamp: Date;
             /**
                 * The End Timestamp of this Hourly Entry
                 *
-                * @public
                 * @type {Date}
+                * @public
                 */
-            get endTimestamp(): Date;
+            endTimestamp: Date;
             /**
                 * The Number of People working in all Areas except Class 2 for this Hour
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get class1Manning(): number;
+            class1Manning: number | null;
             /**
                 * The Number of People working in the Class 2 Area for this Hour
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get class2Manning(): number;
+            class2Manning: number | null;
             /**
                 * The Average Target Number of People that should be working for this Hour
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get averageManningTarget(): number;
+            averageManningTarget: number | null;
             /**
                 * The Percentage of Total Tray Equivalents that are Layered for this Hour
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get layeredTrayPercentage(): number;
+            layeredTrayPercentage: number | null;
             /**
                 * The Average Class 1 Percentage for this Hour
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get averageClass1Percentage(): number;
+            averageClass1Percentage: number | null;
             /**
                 * The Number of Quality R600 Samples that were Ideal for this Hour
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get qualityR600IdealSamplesPercentage(): number;
+            qualityR600IdealSamplesPercentage: number | null;
             /**
                 * An Array of Custom Quality Data Items for this Hour
                 *
-                * @public
                 * @type {Array<{id: string, name: string, type: string, value: number}>}
+                * @public
                 */
-            get customQualityData(): {
+            customQualityData: {
                     id: string;
                     name: string;
                     type: string;
@@ -12796,189 +12105,173 @@ declare module '@ricado/api-client/Models/Packhouse/Site/ShiftHourlyEntryModel'
             /**
                 * The Total Number of Bins Tipped for this Hour
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get totalBinsTipped(): number;
+            totalBinsTipped: number;
             /**
                 * The Target Number of Bins to Tip for this Hour
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get binsTippedTarget(): number;
+            binsTippedTarget: number;
             /**
                 * The Total Downtime for this Hour expressed in Seconds
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get totalDowntime(): number;
+            totalDowntime: number;
             /**
                 * The Total Time that could be Utilized for Packing Fruit (excludes Planned Downtime such as Smoko Breaks) for this Hour expressed in Seconds
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get totalProductionTime(): number;
+            totalProductionTime: number;
             /**
                 * The Total Number of Class 1 Tray Equivalents Packed for this Hour
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get totalClass1Trays(): number;
+            totalClass1Trays: number;
             /**
                 * The Total Number of Class 2 Tray Equivalents Packed for this Hour
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get totalClass2Trays(): number;
+            totalClass2Trays: number;
             /**
                 * The Target Number of Class 1 Tray Equivalents that should be Packed excluding all Downtime for this Hour
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get class1TraysPerHourExcludingDowntimeTarget(): number;
+            class1TraysPerHourExcludingDowntimeTarget: number;
             /**
                 * The Primary Issue Category for this Hourly Entry
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get primaryIssueCategory(): string;
+            primaryIssueCategory: string | null;
             /**
                 * The Primary Issue Tag for this Hourly Entry
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get primaryIssueTag(): string;
+            primaryIssueTag: string | null;
             /**
                 * The Secondary Issue Category for this Hourly Entry
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get secondaryIssueCategory(): string;
+            secondaryIssueCategory: string | null;
             /**
                 * The Secondary Issue Tag for this Hourly Entry
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get secondaryIssueTag(): string;
+            secondaryIssueTag: string | null;
             /**
                 * An Optional Focus for the Next Hour
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get nextHourFocus(): string;
+            nextHourFocus: string | null;
             /**
                 * An Optional Rating between 1 and 10 on how Satisfied the Line Manager was with this Hour
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get satisfactionRating(): number;
+            satisfactionRating: number | null;
             /**
                 * The Status of this Hourly Entry
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get status(): string;
+            status: string;
             /**
                 * The Number of Class 1 Tray Equivalents that would have been Packed this Hour without Planned Downtime (e.g. Smoko Breaks)
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get class1TraysPerHourPotential(): number;
+            class1TraysPerHourPotential: number;
             /**
                 * The Number of Class 1 Tray Equivalents that would have been Packed this Hour with Zero Downtime
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get class1TraysPerHourExcludingDowntime(): number;
+            class1TraysPerHourExcludingDowntime: number;
             /**
                 * The Number of Class 1 Tray Equivalents that would have been Packed per Person this Hour without Planned Downtime (e.g. Smoko Breaks)
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get class1TraysPerManHourPotential(): number;
+            class1TraysPerManHourPotential: number | null;
             /**
                 * The Number of Class 1 Tray Equivalents that would have been Packed per Person this Hour with Zero Downtime
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get class1TraysPerManHourExcludingDowntime(): number;
+            class1TraysPerManHourExcludingDowntime: number | null;
             /**
                 * The Manning Percentage based on the Average Target for this Hour
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get manningPercentage(): number;
+            manningPercentage: number | null;
             /**
                 * The Total Number of People working for this Hour
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get totalManning(): number;
+            totalManning: number | null;
             /**
                 * The Percentage of Production Time without Downtime for this Hour
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get uptimePercentage(): number;
+            uptimePercentage: number;
             /**
                 * The Percentage of Downtime for this Hour
                 *
-                * @public
                 * @type {number}
+                * @public
                 */
-            get downtimePercentage(): number;
+            downtimePercentage: number;
             /**
                 * Whether the Shift Hourly Entry has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Shift Hourly Entry was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Shift Hourly Entry
-                *
-                * @public
-                * @type {number}
-                */
-            get siteId(): number;
-            /**
-                * Convert this **ShiftHourlyEntryModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Packhouse/Site/ShiftModel' {
@@ -12988,136 +12281,128 @@ declare module '@ricado/api-client/Models/Packhouse/Site/ShiftModel' {
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class ShiftModel extends BaseSiteModel {
+    class ShiftModel extends BaseModel {
             /**
                 * Create a new **ShiftModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Shift
                 * @return {ShiftModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): ShiftModel;
-            /**
-                * ShiftModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Shift
-                */
-            protected constructor();
+            } | string): ShiftModel;
             /**
                 * The Shift ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Packing Line ID this Shift is associated with
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get packingLineId(): string;
+            packingLineId: string;
             /**
                 * When this Shift was Created
                 *
-                * @public
                 * @type {Date}
+                * @public
                 */
-            get createdTimestamp(): Date;
+            createdTimestamp: Date;
             /**
                 * The Type of Shift
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get type(): string;
+            type: string;
             /**
                 * The Name of the Line Manager for this Shift
                 *
-                * @public
                 * @type {?string}
+                * @public
                 */
-            get lineManagerName(): string;
+            lineManagerName: string | null;
             /**
                 * The Target Number of Bins to Tip for this Shift
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get binsTippedTarget(): number;
+            binsTippedTarget: number | null;
             /**
                 * *DEPRECATED* The Initial Number of People working in all Areas except Class 2 for this Hour
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get initialClass1Manning(): number;
+            initialClass1Manning: number | null;
             /**
                 * *DEPRECATED* The Initial Number of People working in the Class 2 Area for this Hour
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get initialClass2Manning(): number;
+            initialClass2Manning: number | null;
             /**
                 * When this Shift was Ready for Packing
                 *
-                * @public
                 * @type {?Date}
+                * @public
                 */
-            get readyTimestamp(): Date;
+            readyTimestamp: Date | null;
             /**
                 * When this Shift was Started
                 *
-                * @public
                 * @type {?Date}
+                * @public
                 */
-            get startTimestamp(): Date;
+            startTimestamp: Date | null;
             /**
                 * When this Shift was Finished
                 *
-                * @public
                 * @type {?Date}
+                * @public
                 */
-            get finishTimestamp(): Date;
+            finishTimestamp: Date | null;
             /**
                 * When this Shift was Published
                 *
-                * @public
                 * @type {?Date}
+                * @public
                 */
-            get publishTimestamp(): Date;
+            publishTimestamp: Date | null;
             /**
                 * An Optional Rating between 1 and 10 on how Satisfied the Line Manager was with this Shift
                 *
-                * @public
                 * @type {?number}
+                * @public
                 */
-            get satisfactionRating(): number;
+            satisfactionRating: number | null;
             /**
                 * *DEPRECATED* An Optional Array of Handover Notes for this Shift
                 *
-                * @public
                 * @type {Array<{area: string, noteContent: string}>}
+                * @public
                 */
-            get handoverNotes(): {
+            handoverNotes: {
                     area: string;
                     noteContent: string;
             }[];
             /**
                 * An Optional Array of Notes for this Shift
                 *
-                * @public
                 * @type {Array<{area: string, timestamp: Date, content: string}>}
+                * @public
                 */
-            get areaNotes(): {
+            areaNotes: {
                     area: string;
                     timestamp: Date;
                     content: string;
@@ -13125,56 +12410,40 @@ declare module '@ricado/api-client/Models/Packhouse/Site/ShiftModel' {
             /**
                 * The Schedule for this Shift
                 *
-                * @public
                 * @type {{startTime: string, endTime: string, breaks: Array<{startTime: string, endTime: string}>}}
+                * @public
                 */
-            get schedule(): {
+            schedule: {
                     startTime: string;
                     endTime: string;
-                    breaks: Array<{
+                    breaks: {
                             startTime: string;
                             endTime: string;
-                    }>;
+                    }[];
             };
             /**
                 * The Status of this Shift
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get status(): string;
+            status: string;
             /**
                 * Whether the Shift has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Shift was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Shift
-                *
-                * @public
-                * @type {number}
-                */
-            get siteId(): number;
-            /**
-                * Convert this **ShiftModel** to a JSON Object
-                *
                 * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }
 
 declare module '@ricado/api-client/Models/Packhouse/Site/VarietyModel' {
@@ -13184,103 +12453,79 @@ declare module '@ricado/api-client/Models/Packhouse/Site/VarietyModel' {
         *
         * @class
         * @hideconstructor
-        * @extends BaseSiteModel
+        * @extends BaseModel
         */
-    class VarietyModel extends BaseSiteModel {
+    class VarietyModel extends BaseModel {
             /**
                 * Create a new **VarietyModel** from a JSON Object or JSON String
                 *
                 * @static
                 * @public
                 * @param {Object<string, any>|string} json A JSON Object or JSON String
-                * @param {number} siteId The Site ID associated with this Variety
                 * @return {VarietyModel}
                 */
             static fromJSON(json: {
                     [x: string]: any;
-            } | string, siteId: number): VarietyModel;
-            /**
-                * VarietyModel Constructor
-                *
-                * @protected
-                * @param {number} siteId The Site ID associated with this Variety
-                */
-            protected constructor();
+            } | string): VarietyModel;
             /**
                 * The Variety ID
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get id(): string;
+            id: string;
             /**
                 * The Variety Code
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get code(): string;
+            code: string;
             /**
                 * The Variety Name
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get name(): string;
+            name: string;
             /**
                 * The Variety Description
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get description(): string;
+            description: string;
             /**
                 * The Variety Image Source
                 *
-                * @public
                 * @type {string}
+                * @public
                 */
-            get image(): string;
+            image: string;
             /**
                 * An Array of Fruit Sizes Defined for this Variety
                 *
-                * @public
                 * @type {Array<{size: string}>}
+                * @public
                 */
-            get fruitSizes(): {
+            fruitSizes: {
                     size: string;
             }[];
             /**
                 * Whether the Variety has been deleted
                 *
-                * @public
                 * @type {boolean}
+                * @public
                 */
-            get deleted(): boolean;
+            deleted: boolean;
             /**
                 * When the Variety was last updated
                 *
-                * @public
                 * @type {Date}
-                */
-            get updateTimestamp(): Date;
-            /**
-                * The Site ID associated with this Variety
-                *
                 * @public
-                * @type {number}
-                */
-            get siteId(): number;
-            /**
-                * Convert this **VarietyModel** to a JSON Object
-                *
-                * @public
-                * @return {Object<string, any>}
                 */
-            toJSON(): {
-                    [x: string]: any;
-            };
+            updateTimestamp: Date;
     }
-    import BaseSiteModel from "@ricado/api-client/Models/Site/BaseSiteModel";
+    import BaseModel from "@ricado/api-client/Models/BaseModel";
 }