diff --git a/src/main/java/net/ripe/rpki/commons/ta/domain/request/ResourceCertificateRequestData.java b/src/main/java/net/ripe/rpki/commons/ta/domain/request/ResourceCertificateRequestData.java
index 197b2dbc7..3d0d985de 100644
--- a/src/main/java/net/ripe/rpki/commons/ta/domain/request/ResourceCertificateRequestData.java
+++ b/src/main/java/net/ripe/rpki/commons/ta/domain/request/ResourceCertificateRequestData.java
@@ -1,15 +1,18 @@
 package net.ripe.rpki.commons.ta.domain.request;
 
 
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
 import net.ripe.ipresource.IpResourceSet;
 import net.ripe.rpki.commons.crypto.x509cert.X509CertificateInformationAccessDescriptor;
-import net.ripe.rpki.commons.util.EqualsSupport;
 
 import javax.security.auth.x500.X500Principal;
 import java.io.Serializable;
 import java.security.PublicKey;
 
-public class ResourceCertificateRequestData extends EqualsSupport implements Serializable {
+@Getter
+@EqualsAndHashCode
+public class ResourceCertificateRequestData implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -46,24 +49,4 @@ public ResourceCertificateRequestData(String resourceClassName, X500Principal su
         this.subjectInformationAccess = subjectInformationAccess;
         this.ipResourceSet = ipResourceSet;
     }
-
-    public String getResourceClassName() {
-        return resourceClassName;
-    }
-
-    public X500Principal getSubjectDN() {
-        return subjectDN;
-    }
-
-    public byte[] getEncodedSubjectPublicKey() {
-        return encodedSubjectPublicKey;
-    }
-
-    public X509CertificateInformationAccessDescriptor[] getSubjectInformationAccess() {
-        return subjectInformationAccess;
-    }
-
-    public IpResourceSet getIpResourceSet() {
-        return ipResourceSet;
-    }
 }
diff --git a/src/main/java/net/ripe/rpki/commons/ta/domain/request/RevocationRequest.java b/src/main/java/net/ripe/rpki/commons/ta/domain/request/RevocationRequest.java
index f92730ef6..89586fa1b 100644
--- a/src/main/java/net/ripe/rpki/commons/ta/domain/request/RevocationRequest.java
+++ b/src/main/java/net/ripe/rpki/commons/ta/domain/request/RevocationRequest.java
@@ -1,9 +1,14 @@
 package net.ripe.rpki.commons.ta.domain.request;
 
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
 
 /**
  * Ask Trust Anchor to revoke all certificates that use the provided public key.
  */
+@Getter
+@EqualsAndHashCode(callSuper = true)
 public class RevocationRequest extends TaRequest {
 
     private static final long serialVersionUID = 1L;
@@ -15,12 +20,4 @@ public RevocationRequest(String resourceClassName, String encodedPublicKey) {
         this.resourceClassName = resourceClassName;
         this.encodedPublicKey = encodedPublicKey;
     }
-
-    public String getEncodedPublicKey() {
-        return encodedPublicKey;
-    }
-
-    public String getResourceClassName() {
-        return resourceClassName;
-    }
 }
diff --git a/src/main/java/net/ripe/rpki/commons/ta/domain/request/SigningRequest.java b/src/main/java/net/ripe/rpki/commons/ta/domain/request/SigningRequest.java
index 19aebae47..dfd7f5dc4 100644
--- a/src/main/java/net/ripe/rpki/commons/ta/domain/request/SigningRequest.java
+++ b/src/main/java/net/ripe/rpki/commons/ta/domain/request/SigningRequest.java
@@ -1,9 +1,11 @@
 package net.ripe.rpki.commons.ta.domain.request;
 
-
-
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
 import org.apache.commons.lang3.Validate;
 
+@Getter
+@EqualsAndHashCode(callSuper = true)
 public class SigningRequest extends TaRequest {
 
     private static final long serialVersionUID = 1L;
@@ -14,8 +16,4 @@ public SigningRequest(ResourceCertificateRequestData resourceCertificateRequest)
         Validate.notNull(resourceCertificateRequest, "resourceCertificateRequest is required");
         this.resourceCertificateRequest = resourceCertificateRequest;
     }
-
-    public ResourceCertificateRequestData getResourceCertificateRequest() {
-        return resourceCertificateRequest;
-    }
 }
diff --git a/src/main/java/net/ripe/rpki/commons/ta/domain/request/TaRequest.java b/src/main/java/net/ripe/rpki/commons/ta/domain/request/TaRequest.java
index 65312633d..f1979e31a 100644
--- a/src/main/java/net/ripe/rpki/commons/ta/domain/request/TaRequest.java
+++ b/src/main/java/net/ripe/rpki/commons/ta/domain/request/TaRequest.java
@@ -1,12 +1,13 @@
 package net.ripe.rpki.commons.ta.domain.request;
 
 
-import net.ripe.rpki.commons.util.EqualsSupport;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.UUID;
 
-public abstract class TaRequest extends EqualsSupport implements Serializable {
+@EqualsAndHashCode
+public abstract class TaRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
     
diff --git a/src/main/java/net/ripe/rpki/commons/ta/domain/request/TrustAnchorRequest.java b/src/main/java/net/ripe/rpki/commons/ta/domain/request/TrustAnchorRequest.java
index 8ee2ccab5..bea9d2acc 100644
--- a/src/main/java/net/ripe/rpki/commons/ta/domain/request/TrustAnchorRequest.java
+++ b/src/main/java/net/ripe/rpki/commons/ta/domain/request/TrustAnchorRequest.java
@@ -1,15 +1,17 @@
 package net.ripe.rpki.commons.ta.domain.request;
 
 
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
 import net.ripe.rpki.commons.crypto.x509cert.X509CertificateInformationAccessDescriptor;
 import org.joda.time.DateTimeUtils;
 
 import java.io.Serializable;
 import java.net.URI;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
+@Getter
+@EqualsAndHashCode
 public class TrustAnchorRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -25,20 +27,4 @@ public TrustAnchorRequest(URI taCertificatePublicationUri, X509CertificateInform
         this.taRequests = taRequests;
         this.siaDescriptors = siaDescriptors;
     }
-
-    public Long getCreationTimestamp() {
-        return creationTimestamp;
-    }
-
-    public URI getTaCertificatePublicationUri() {
-        return taCertificatePublicationUri;
-    }
-
-    public List<TaRequest> getTaRequests() {
-        return taRequests;
-    }
-
-    public X509CertificateInformationAccessDescriptor[] getSiaDescriptors() {
-        return siaDescriptors;
-    }
 }