diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/core/model/AddressModel.java b/server/src/main/java/au/org/aodn/ogcapi/server/core/model/AddressModel.java
index b03a9d7c..b8cdb4d1 100644
--- a/server/src/main/java/au/org/aodn/ogcapi/server/core/model/AddressModel.java
+++ b/server/src/main/java/au/org/aodn/ogcapi/server/core/model/AddressModel.java
@@ -1,14 +1,20 @@
 package au.org.aodn.ogcapi.server.core.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
 //https://github.com/stac-extensions/contacts?tab=readme-ov-file#address-object
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class AddressModel {
 
     @JsonProperty("delivery_point")
@@ -21,14 +27,4 @@ public class AddressModel {
     @JsonProperty("postal_code")
     protected String postalCode;
     protected String country;
-
-
-    // for testing usage
-    public AddressModel(List<String> deliveryPoint, String city, String administrativeArea, String postalCode, String country) {
-        this.deliveryPoint = deliveryPoint;
-        this.city = city;
-        this.administrativeArea = administrativeArea;
-        this.postalCode = postalCode;
-        this.country = country;
-    }
 }
diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/core/model/InfoModel.java b/server/src/main/java/au/org/aodn/ogcapi/server/core/model/InfoModel.java
index 50dcef60..919d87eb 100644
--- a/server/src/main/java/au/org/aodn/ogcapi/server/core/model/InfoModel.java
+++ b/server/src/main/java/au/org/aodn/ogcapi/server/core/model/InfoModel.java
@@ -1,13 +1,19 @@
 package au.org.aodn.ogcapi.server.core.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
 //https://github.com/stac-extensions/contacts?tab=readme-ov-file#info-object
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class InfoModel {
     protected String value;
     protected List<String> roles;