diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/core/model/enumeration/CQLFields.java b/server/src/main/java/au/org/aodn/ogcapi/server/core/model/enumeration/CQLFields.java
index 1437e7c5..0bee076f 100644
--- a/server/src/main/java/au/org/aodn/ogcapi/server/core/model/enumeration/CQLFields.java
+++ b/server/src/main/java/au/org/aodn/ogcapi/server/core/model/enumeration/CQLFields.java
@@ -228,6 +228,19 @@ public enum CQLFields implements CQLFieldsInterface {
             null,
             null
     ),
+    // Fields for training ML keyword classification model and delivery mode classification model
+    themes(
+            StacBasicField.Themes.searchField,
+            StacBasicField.Themes.searchField,
+            null,
+            null
+    ),
+    statement(
+            StacSummeries.Statement.searchField,
+            StacSummeries.Statement.displayField,
+            null,
+            null
+    ),
     ;
     private final String searchField;
 
diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/core/model/enumeration/StacBasicField.java b/server/src/main/java/au/org/aodn/ogcapi/server/core/model/enumeration/StacBasicField.java
index 0e01aa13..752cdcd0 100644
--- a/server/src/main/java/au/org/aodn/ogcapi/server/core/model/enumeration/StacBasicField.java
+++ b/server/src/main/java/au/org/aodn/ogcapi/server/core/model/enumeration/StacBasicField.java
@@ -23,7 +23,8 @@ public enum StacBasicField {
     Links("links", "links"),
     LinksTitle("links.title", "links.title"),
     Collection("collection", "collection", "collection.keyword"),
-    AssetsSummary("assets", "assets")
+    AssetsSummary("assets", "assets"),
+    Themes("themes", "themes")
     ;
 
     // Field that use to do sort, elastic search treat FieldData (searchField) differently, a searchField is not
diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/core/model/enumeration/StacSummeries.java b/server/src/main/java/au/org/aodn/ogcapi/server/core/model/enumeration/StacSummeries.java
index 654500b5..6885a002 100644
--- a/server/src/main/java/au/org/aodn/ogcapi/server/core/model/enumeration/StacSummeries.java
+++ b/server/src/main/java/au/org/aodn/ogcapi/server/core/model/enumeration/StacSummeries.java
@@ -12,7 +12,8 @@ public enum StacSummeries {
     UpdateFrequency("summaries.update_frequency", "summaries.update_frequency"),
     DatasetProvider("summaries.dataset_provider", "summaries.dataset_provider"),
     DatasetGroup("summaries.dataset_group", "summaries.dataset_group"),
-    Status("summaries.status", "summaries.status")
+    Status("summaries.status", "summaries.status"),
+    Statement("summaries.statement", "summaries.statement")
     ;
 
     public final String sortField;