diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/core/model/ConceptModel.java b/server/src/main/java/au/org/aodn/ogcapi/server/core/model/ConceptModel.java
index 89912760..b252d5ca 100644
--- a/server/src/main/java/au/org/aodn/ogcapi/server/core/model/ConceptModel.java
+++ b/server/src/main/java/au/org/aodn/ogcapi/server/core/model/ConceptModel.java
@@ -12,4 +12,6 @@
 public class ConceptModel {
     protected String id;
     protected String url;
+    protected String description;
+    protected String title;
 }
diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/core/model/ThemeModel.java b/server/src/main/java/au/org/aodn/ogcapi/server/core/model/ThemeModel.java
index 6825d2e6..1a2adbcf 100644
--- a/server/src/main/java/au/org/aodn/ogcapi/server/core/model/ThemeModel.java
+++ b/server/src/main/java/au/org/aodn/ogcapi/server/core/model/ThemeModel.java
@@ -13,8 +13,6 @@
 @AllArgsConstructor
 public class ThemeModel {
     protected String scheme;
-    protected String description;
-    protected String title;
     protected List<ConceptModel> concepts;
 
 }
diff --git a/server/src/test/java/au/org/aodn/ogcapi/server/core/mapper/StacToCollectionTest.java b/server/src/test/java/au/org/aodn/ogcapi/server/core/mapper/StacToCollectionTest.java
index c15abd14..cfcca69e 100644
--- a/server/src/test/java/au/org/aodn/ogcapi/server/core/mapper/StacToCollectionTest.java
+++ b/server/src/test/java/au/org/aodn/ogcapi/server/core/mapper/StacToCollectionTest.java
@@ -91,9 +91,9 @@ public void verifyAddingPropertyWorks() {
                 .build();
         var theme = ThemeModel.builder()
                 .scheme("scheme")
-                .description("description")
-                .title("title")
-                .concepts(Collections.singletonList(ConceptModel.builder().id("id").url("url").build()))
+                .concepts(Collections.singletonList(
+                        ConceptModel.builder().id("id").url("url").description("description").title("title").build()
+                        ))
                 .build();
         var citationString = "{\"suggestedCitation\":\"this is suggested Citation\",\"useLimitations\":[\"this is useLimitations1\",\"this is useLimitations2\"],\"otherConstraints\":[\"this is otherConstraints1\",\"this is otherConstraints2\"]}";
         var statement = "This is the statement of this record";