diff --git a/OpenActive.NET.Generator/package-lock.json b/OpenActive.NET.Generator/package-lock.json
index ad47b25..5e03a65 100644
--- a/OpenActive.NET.Generator/package-lock.json
+++ b/OpenActive.NET.Generator/package-lock.json
@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "@openactive/data-models": {
-      "version": "2.0.166",
-      "resolved": "https://registry.npmjs.org/@openactive/data-models/-/data-models-2.0.166.tgz",
-      "integrity": "sha512-yx9QhdbGIntozRBJpJjPAGtXNeLDeFT6I9dBZQv0q6w/h5E36mHTuLvR7JedZI7AFF9VocGfLEGydmjca0cVUQ=="
+      "version": "2.0.170",
+      "resolved": "https://registry.npmjs.org/@openactive/data-models/-/data-models-2.0.170.tgz",
+      "integrity": "sha512-cnQ/KxZssKCS8s7j40P+hqUu7ugkj4nR2cIVGEMd7mCKM9u4LeFxKuz/lZUlXjE8UBtxR95TEGHP1FdKYO3D8A=="
     },
     "@types/concat-stream": {
       "version": "1.6.0",
diff --git a/OpenActive.NET.Generator/package.json b/OpenActive.NET.Generator/package.json
index 31aa40d..e979563 100644
--- a/OpenActive.NET.Generator/package.json
+++ b/OpenActive.NET.Generator/package.json
@@ -11,7 +11,7 @@
   "author": "Nick Evans",
   "license": "MIT",
   "dependencies": {
-    "@openactive/data-models": "^2.0.166",
+    "@openactive/data-models": "^2.0.170",
     "fs-extra": "^7.0.1",
     "sync-request": "^6.0.0"
   }
diff --git a/OpenActive.NET/models/ChangeOfLogisticsLocationSimulateAction.cs b/OpenActive.NET/models/ChangeOfLogisticsLocationSimulateAction.cs
new file mode 100644
index 0000000..756fcb9
--- /dev/null
+++ b/OpenActive.NET/models/ChangeOfLogisticsLocationSimulateAction.cs
@@ -0,0 +1,51 @@
+
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace OpenActive.NET
+{
+    /// <summary>
+    /// [NOTICE: This class is part of the Open Booking API Test Interface, and MUST NOT be used in production.] 
+    /// This type is derived from https://schema.org/Action, which means that any of this type's properties within schema.org may also be used.
+    /// </summary>
+    [DataContract]
+    public partial class ChangeOfLogisticsLocationSimulateAction : OpenBookingSimulateAction
+    {
+        /// <summary>
+        /// Returns the JSON-LD representation of this instance.
+        /// This method overrides Schema.NET ToString() to serialise using OpenActiveSerializer.
+        /// </summary>
+        /// <returns>A <see cref="string" /> that represents the JSON-LD representation of this instance.</returns>
+        public override string ToString()
+        {
+            return OpenActiveSerializer.Serialize(this);
+        }
+
+        /// <summary>
+        /// Returns the JSON-LD representation of this instance, including "https://schema.org" in the "@context".
+        ///
+        /// This method must be used when you want to embed the output raw (as-is) into a web
+        /// page. It uses serializer settings with HTML escaping to avoid Cross-Site Scripting (XSS)
+        /// vulnerabilities if the object was constructed from an untrusted source.
+        /// 
+        /// This method overrides Schema.NET ToHtmlEscapedString() to serialise using OpenActiveSerializer.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="string" /> that represents the JSON-LD representation of this instance.
+        /// </returns>
+        public new string ToHtmlEscapedString()
+        {
+            return OpenActiveSerializer.SerializeToHtmlEmbeddableString(this);
+        }
+
+        /// <summary>
+        /// Gets the name of the type as specified by schema.org.
+        /// </summary>
+        [DataMember(Name = "@type", Order = 1)]
+        public override string Type => "test:ChangeOfLogisticsLocationSimulateAction";
+
+        
+    }
+}
diff --git a/OpenActive.NET/models/ChangeOfLogisticsSimulateAction.cs b/OpenActive.NET/models/ChangeOfLogisticsNameSimulateAction.cs
similarity index 91%
rename from OpenActive.NET/models/ChangeOfLogisticsSimulateAction.cs
rename to OpenActive.NET/models/ChangeOfLogisticsNameSimulateAction.cs
index 0abc620..bbf339e 100644
--- a/OpenActive.NET/models/ChangeOfLogisticsSimulateAction.cs
+++ b/OpenActive.NET/models/ChangeOfLogisticsNameSimulateAction.cs
@@ -11,7 +11,7 @@ namespace OpenActive.NET
     /// This type is derived from https://schema.org/Action, which means that any of this type's properties within schema.org may also be used.
     /// </summary>
     [DataContract]
-    public partial class ChangeOfLogisticsSimulateAction : OpenBookingSimulateAction
+    public partial class ChangeOfLogisticsNameSimulateAction : OpenBookingSimulateAction
     {
         /// <summary>
         /// Returns the JSON-LD representation of this instance.
@@ -44,7 +44,7 @@ public override string ToString()
         /// Gets the name of the type as specified by schema.org.
         /// </summary>
         [DataMember(Name = "@type", Order = 1)]
-        public override string Type => "test:ChangeOfLogisticsSimulateAction";
+        public override string Type => "test:ChangeOfLogisticsNameSimulateAction";
 
         
     }
diff --git a/OpenActive.NET/models/ChangeOfLogisticsTimeSimulateAction.cs b/OpenActive.NET/models/ChangeOfLogisticsTimeSimulateAction.cs
new file mode 100644
index 0000000..290b677
--- /dev/null
+++ b/OpenActive.NET/models/ChangeOfLogisticsTimeSimulateAction.cs
@@ -0,0 +1,51 @@
+
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace OpenActive.NET
+{
+    /// <summary>
+    /// [NOTICE: This class is part of the Open Booking API Test Interface, and MUST NOT be used in production.] 
+    /// This type is derived from https://schema.org/Action, which means that any of this type's properties within schema.org may also be used.
+    /// </summary>
+    [DataContract]
+    public partial class ChangeOfLogisticsTimeSimulateAction : OpenBookingSimulateAction
+    {
+        /// <summary>
+        /// Returns the JSON-LD representation of this instance.
+        /// This method overrides Schema.NET ToString() to serialise using OpenActiveSerializer.
+        /// </summary>
+        /// <returns>A <see cref="string" /> that represents the JSON-LD representation of this instance.</returns>
+        public override string ToString()
+        {
+            return OpenActiveSerializer.Serialize(this);
+        }
+
+        /// <summary>
+        /// Returns the JSON-LD representation of this instance, including "https://schema.org" in the "@context".
+        ///
+        /// This method must be used when you want to embed the output raw (as-is) into a web
+        /// page. It uses serializer settings with HTML escaping to avoid Cross-Site Scripting (XSS)
+        /// vulnerabilities if the object was constructed from an untrusted source.
+        /// 
+        /// This method overrides Schema.NET ToHtmlEscapedString() to serialise using OpenActiveSerializer.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="string" /> that represents the JSON-LD representation of this instance.
+        /// </returns>
+        public new string ToHtmlEscapedString()
+        {
+            return OpenActiveSerializer.SerializeToHtmlEmbeddableString(this);
+        }
+
+        /// <summary>
+        /// Gets the name of the type as specified by schema.org.
+        /// </summary>
+        [DataMember(Name = "@type", Order = 1)]
+        public override string Type => "test:ChangeOfLogisticsTimeSimulateAction";
+
+        
+    }
+}
diff --git a/OpenActive.NET/models/OpeningHoursSpecification.cs b/OpenActive.NET/models/OpeningHoursSpecification.cs
index 493f6e1..e6c05a6 100644
--- a/OpenActive.NET/models/OpeningHoursSpecification.cs
+++ b/OpenActive.NET/models/OpeningHoursSpecification.cs
@@ -61,7 +61,7 @@ public override string ToString()
 
 
         /// <summary>
-        /// Defines the days of the week upon which the `opens` and `closes` values are specified.
+        /// Defines the days of the week upon which the `opens` and `closes` values are specified. Note this property is optional when used within `specialOpeningHoursSpecification`.
         /// </summary>
         /// <example>
         /// <code>
@@ -90,7 +90,7 @@ public override string ToString()
 
 
         /// <summary>
-        /// The date when the item becomes valid. The item will be valid at the beginning of the specified day.
+        /// The date when the item becomes valid. The item will be valid at the beginning of the specified day. Note this property is required when used within `specialOpeningHoursSpecification`.
         /// </summary>
         /// <example>
         /// <code>
@@ -103,7 +103,7 @@ public override string ToString()
 
 
         /// <summary>
-        /// The date after which the item is no longer valid. The item will cease to be valid at the end of the specified day.
+        /// The date after which the item is no longer valid. The item will cease to be valid at the end of the specified day. Note this property is required when used within `specialOpeningHoursSpecification`.
         /// </summary>
         /// <example>
         /// <code>