diff --git a/.gitignore b/.gitignore
index 3fddd55d..2a4f3463 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,6 @@ test-app/gradle-local.properties
 test-app/docker
 test-app/containerLogs
 test-complete-app/build
-test-complete-app/.gradle
\ No newline at end of file
+test-complete-app/.gradle
+test-complete-app-mlDeploy/build
+test-complete-app-mlDeploy/.gradle
\ No newline at end of file
diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server.json
index 09c64be4..20cae4aa 100644
--- a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server.json
+++ b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server.json
@@ -1,7 +1,15 @@
 {
   "database-name": "node-client-api-rest-server",
   "schema-database": "Schemas",
+  "stemmed-searches": "basic",
   "range-element-index": [
+    {
+      "scalar-type": "double",
+      "namespace-uri": "",
+      "localname": "amt",
+      "range-value-positions": false,
+      "invalid-values": "ignore"
+    },
     {
       "scalar-type": "double",
       "namespace-uri": "",
@@ -29,6 +37,34 @@
       "localname": "datetime",
       "range-value-positions": false,
       "invalid-values": "ignore"
+    },
+    {
+      "scalar-type": "dateTime",
+      "namespace-uri": "",
+      "localname": "systemStartTime",
+      "range-value-positions": false,
+      "invalid-values": "ignore"
+    },
+    {
+      "scalar-type": "dateTime",
+      "namespace-uri": "",
+      "localname": "systemEndTime",
+      "range-value-positions": false,
+      "invalid-values": "ignore"
+    },
+    {
+      "scalar-type": "dateTime",
+      "namespace-uri": "",
+      "localname": "validStartTime",
+      "range-value-positions": false,
+      "invalid-values": "ignore"
+    },
+    {
+      "scalar-type": "dateTime",
+      "namespace-uri": "",
+      "localname": "validEndTime",
+      "range-value-positions": false,
+      "invalid-values": "ignore"
     }
   ],
   "range-path-index": [
diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-system-axis.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-system-axis.json
new file mode 100644
index 00000000..37905abc
--- /dev/null
+++ b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-system-axis.json
@@ -0,0 +1,17 @@
+{
+    "axis-name": "systemTime",
+    "axis-start": {
+        "element-reference": {
+            "namespace-uri": "",
+            "localname": "systemStartTime",
+            "scalar-type": "dateTime"
+        }
+    },
+    "axis-end": {
+        "element-reference": {
+            "namespace-uri": "",
+            "localname": "systemEndTime",
+            "scalar-type": "dateTime"
+        }
+    }
+}
\ No newline at end of file
diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-valid-axis.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-valid-axis.json
new file mode 100644
index 00000000..46313d9c
--- /dev/null
+++ b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-valid-axis.json
@@ -0,0 +1,17 @@
+{
+    "axis-name": "validTime",
+    "axis-start": {
+        "element-reference": {
+            "namespace-uri": "",
+            "localname": "validStartTime",
+            "scalar-type": "dateTime"
+        }
+    },
+    "axis-end": {
+        "element-reference": {
+            "namespace-uri": "",
+            "localname": "validEndTime",
+            "scalar-type": "dateTime"
+        }
+    }
+}
\ No newline at end of file
diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporal-collection.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporal-collection.json
new file mode 100644
index 00000000..7530249c
--- /dev/null
+++ b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporal-collection.json
@@ -0,0 +1,6 @@
+{
+    "collection-name": "temporalCollection",
+    "system-axis": "systemTime",
+    "valid-axis": "validTime",
+    "option": [ "updates-safe" ]
+}
\ No newline at end of file
diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporalCollectionLsqt.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporalCollectionLsqt.json
new file mode 100644
index 00000000..e4a82793
--- /dev/null
+++ b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporalCollectionLsqt.json
@@ -0,0 +1,6 @@
+{
+    "collection-name": "temporalCollectionLsqt",
+    "system-axis": "systemTime",
+    "valid-axis": "validTime",
+    "option": [ "updates-safe" ]
+}
\ No newline at end of file
diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTest.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTest.json
index b7b695cf..3276e78b 100644
--- a/test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTest.json
+++ b/test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTest.json
@@ -4,7 +4,9 @@
   "fast-element-trailing-wildcard-searches": true,
   "two-character-searches": true,
   "one-character-searches": true,
+  "triple-index": true,
   "uri-lexicon": true,
+  "collection-lexicon": true,
   "range-element-index": [
     {
       "scalar-type": "string",
diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-temporal-writer.json b/test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-temporal-writer.json
new file mode 100644
index 00000000..a78e7c6d
--- /dev/null
+++ b/test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-temporal-writer.json
@@ -0,0 +1,24 @@
+{
+  "role-name": "rest-temporal-writer",
+  "description": "REST writer with temporal privileges",
+  "role": [
+    "rest-writer"
+  ],
+  "privilege": [
+    {
+      "privilege-name": "temporal-statement-set-system-time",
+      "action": "http://marklogic.com/xdmp/privileges/temporal-statement-set-system-time",
+      "kind": "execute"
+    },
+    {
+      "privilege-name": "temporal-document-protect",
+      "action": "http://marklogic.com/xdmp/privileges/temporal-document-protect",
+      "kind": "execute"
+    },
+    {
+      "privilege-name": "temporal-document-wipe",
+      "action": "http://marklogic.com/xdmp/privileges/temporal-document-wipe",
+      "kind": "execute"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/test-app/src/main/ml-config/security/users/rest-temporal-writer.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-temporal-writer.json
similarity index 100%
rename from test-app/src/main/ml-config/security/users/rest-temporal-writer.json
rename to test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-temporal-writer.json