diff --git a/package-lock.json b/package-lock.json
index e05bbef..a557c30 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@cds-au/testdata",
-  "version": "1.6.2",
+  "version": "1.7.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@cds-au/testdata",
-      "version": "1.6.2",
+      "version": "1.7.0",
       "license": "MIT",
       "dependencies": {
         "@faker-js/faker": "^7.6.0",
diff --git a/package.json b/package.json
index 06c6b46..47be1f9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cds-au/testdata",
-  "version": "1.6.2",
+  "version": "1.7.0",
   "description": "Tools for the creation of manufactured test data for the Australian Consumer Data Right regime",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/src/cli.ts b/src/cli.ts
index adc074d..1fbdbea 100644
--- a/src/cli.ts
+++ b/src/cli.ts
@@ -14,7 +14,7 @@ const argv = yargs
     f: 'factory',
     fs: 'factories',
     g: 'generate',
-    s: 'schema',
-    vd: 'validate'
+    s: 'schema'
+    // vd: 'validate', TODO: This needs to be implemented
   })
   .argv;
diff --git a/src/logic/schema/cdr-test-data-schema.ts b/src/logic/schema/cdr-test-data-schema.ts
index 92e32b7..3b25dd4 100644
--- a/src/logic/schema/cdr-test-data-schema.ts
+++ b/src/logic/schema/cdr-test-data-schema.ts
@@ -1,6 +1,6 @@
-import { BankingAccountV2, BankingBalance, BankingDirectDebit, BankingPayeeDetailV2, BankingProductV4, BankingScheduledPayment, BankingTransaction } from "consumer-data-standards/banking";
+import { BankingAccountV2, BankingBalance, BankingDirectDebit, BankingPayeeDetailV2, BankingProductV4, BankingScheduledPaymentV2, BankingTransaction } from "consumer-data-standards/banking";
 import { CommonOrganisationDetailV2, CommonPersonDetailV2 } from "consumer-data-standards/common";
-import { EnergyAccountV2, EnergyAccountDetailV2, EnergyAccountDetailV3, EnergyBillingTransaction, EnergyConcession, EnergyDerRecord, EnergyInvoice, EnergyPaymentSchedule, EnergyPlan, EnergyPlanDetail, EnergyServicePoint, EnergyServicePointDetail, EnergyUsageRead } from "consumer-data-standards/energy";
+import { EnergyAccountDetailV4, EnergyBillingTransactionV3, EnergyConcession, EnergyDerRecord, EnergyInvoice, EnergyPaymentSchedule, EnergyPlanDetailV3, EnergyUsageRead, EnergyServicePointDetail } from "consumer-data-standards/energy";
 import { RegisterDataRecipient } from "consumer-data-standards/register";
 
  /* A JSON schema for defining test data files that can be used to seed a mock, or test, implementation of a Data Holder for the Consumer Data Right
@@ -52,7 +52,7 @@ export interface EnergyServicePointWrapper {
  * A wrapper for a single eenrgy account to contain all of the data related to the account
  */
 export interface EnergyAccountWrapper {
-  account: EnergyAccountDetailV3;
+  account: EnergyAccountDetailV4;
   balance: string;
   /**
    * An array of agreed payment schedules
@@ -65,7 +65,7 @@ export interface EnergyAccountWrapper {
   /**
    * An array of transactions for the account
    */
-  transactions?: EnergyBillingTransaction[];
+  transactions?: EnergyBillingTransactionV3[];
   /**
    * An array of concessions for the account
    */
@@ -120,7 +120,7 @@ export interface CustomerWrapper {
     /**
      * An array of payment schedules
      */
-    payments?: BankingScheduledPayment[];
+    payments?: BankingScheduledPaymentV2[];
     [k: string]: unknown;
   };
   /**
@@ -174,7 +174,7 @@ export interface Unauthenticated {
     /**
      * An array of energy plans
      */
-    plans?: EnergyPlanDetail[];
+    plans?: EnergyPlanDetailV3[];
   };
   /**
    * Current system status
diff --git a/src/schema/cdr-test-data-schema.json b/src/schema/cdr-test-data-schema.json
index 4ca06e0..3ec2461 100644
--- a/src/schema/cdr-test-data-schema.json
+++ b/src/schema/cdr-test-data-schema.json
@@ -161,13 +161,13 @@
 			"description": "A previously registered client aligned to the current version of the data standards"
 		},
 		"recipient": {
-      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.20.0/schemas/register/RegisterDataRecipient.json"
+      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.33.0/schemas/register/RegisterDataRecipient.json"
 		},
     "bankProduct": {
-      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.20.0/schemas/banking/BankingProductDetailV4"
+      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.33.0/schemas/banking/BankingProductDetailV4.json"
 		},
     "energyPlan": {
-      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.20.0/schemas/energy/EnergyPlanDetail.json"
+      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.33.0/schemas/energy/EnergyPlanDetailV3.json"
 		},
     "adminStatus": {
 			"type": "object",
@@ -254,18 +254,18 @@
 			"description": "A customer object aligned to the current version of the data standards",
       "properties": {
         "customerUType": "string",
-        "person": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.20.0/schemas/common/CommonPersonDetailV2.json",
-        "organisation": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.20.0/schemas/common/CommonOrganisationDetailV2.json"
+        "person": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.33.0/schemas/common/CommonPersonDetailV2.json",
+        "organisation": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.33.0/schemas/common/CommonOrganisationDetailV2.json"
       }
     },
     "bankDirectDebit": {
-      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.20.0/schemas/banking/BankingDirectDebit.json"
+      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.33.0/schemas/banking/BankingDirectDebit.json"
     },
     "bankPayee": {
-      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.20.0/schemas/banking/BankingPayeeDetailV2.json"
+      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.33.0/schemas/banking/BankingPayeeDetailV2.json"
     },
     "bankPaymentSchedule": {
-      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.20.0/schemas/banking/BankingScheduledPayment.json"
+      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.33.0/schemas/banking/BankingScheduledPaymentV2.json"
     },
     "bankAccountWrapper": {
       "type": "object",
@@ -291,13 +291,13 @@
       }
     },
     "bankAccount": {
-      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.20.0/schemas/banking/BankingAccountDetailV3.json"
+      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.33.0/schemas/banking/BankingAccountDetailV4.json"
     },
     "bankAccountBalance": {
-      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.20.0/schemas/banking/BankingBalance.json"
+      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.33.0/schemas/banking/BankingBalance.json"
     },
     "bankTransaction": {
-      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.20.0/schemas/banking/BankingTransactionDetail.json"
+      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.33.0/schemas/banking/BankingTransactionDetailV2.json"
     },
     "energyAccountWrapper": {
       "type": "object",
@@ -344,23 +344,23 @@
       }
     },
     "energyAccount": {
-      "%ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.20.0/schemas/energy/EnergyAccountDetailV2.json"
+      "%ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.33.0/schemas/energy/EnergyAccountDetailV4.json"
     },
     "energyAccountBalance": {
       "type": "object",
 			"description": "Distributed energy resources for an energy account aligned to the current version of the data standards"
     },
     "energyPaymentSchedule": {
-      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.20.0/schemas/energy/EnergyPaymentSchedule.json"
+      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.33.0/schemas/energy/EnergyPaymentSchedule.json"
       },
     "energyInvoice": {
-      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.20.0/schemas/energy/EnergyInvoice.json"
+      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.33.0/schemas/energy/EnergyInvoice.json"
     },
     "energyTransaction": {
-			"$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.20.0/schemas/energy/EnergyBillingTransaction.json"
+			"$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.33.0/schemas/energy/EnergyBillingTransactionV3.json"
     },
     "energyConcession": {
-      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.20.0/schemas/energy/EnergyConcession.json"
+      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.33.0/schemas/energy/EnergyConcession.json"
     },
     "energyServicePointWrapper": {
       "type": "object",
@@ -387,13 +387,13 @@
       }
     },
     "energyServicePoint": {
-      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.20.0/schemas/energy/EnergyServicePointDetail.json"
+      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.33.0/schemas/energy/EnergyServicePointDetail.json"
           },
     "energyDerData": {
-      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.20.0/schemas/energy/EnergyDerRecord.json"
+      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.33.0/schemas/energy/EnergyDerRecord.json"
     },
     "energyUsageRead": {
-      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.20.0/schemas/energy/EnergyUsageRead.json"
+      "$ref": "https://raw.githubusercontent.com/ConsumerDataStandardsAustralia/dsb-schema-tools/main/1.33.0/schemas/energy/EnergyUsageRead.json"
      }
 	}
 }
\ No newline at end of file