diff --git a/src/main/java/com/incognia/api/IncogniaAPI.java b/src/main/java/com/incognia/api/IncogniaAPI.java
index 338590d..2c729cf 100644
--- a/src/main/java/com/incognia/api/IncogniaAPI.java
+++ b/src/main/java/com/incognia/api/IncogniaAPI.java
@@ -408,14 +408,14 @@ public void registerFeedback(
 
   public void registerFeedback(
       FeedbackEvent feedbackEvent,
-      Instant timestamp,
+      Instant occurredAt,
       FeedbackIdentifiers identifiers,
       boolean dryRun)
       throws IncogniaException {
     PostFeedbackRequestBody requestBody =
         PostFeedbackRequestBody.builder()
             .event(feedbackEvent)
-            .timestamp(timestamp.toEpochMilli())
+            .occurredAt(occurredAt)
             .installationId(identifiers.getInstallationId())
             .sessionToken(identifiers.getSessionToken())
             .accountId(identifiers.getAccountId())
diff --git a/src/main/java/com/incognia/common/AdditionalLocation.java b/src/main/java/com/incognia/common/AdditionalLocation.java
index 0163dd2..e50bb99 100644
--- a/src/main/java/com/incognia/common/AdditionalLocation.java
+++ b/src/main/java/com/incognia/common/AdditionalLocation.java
@@ -3,10 +3,14 @@
 import lombok.Builder;
 import lombok.Value;
 
+import java.time.Instant;
+
 @Value
 @Builder
 public class AdditionalLocation {
   Double lat;
   Double lng;
+  @Deprecated
   Long timestamp;
+  Instant collectedAt;
 }
diff --git a/src/main/java/com/incognia/feedback/PostFeedbackRequestBody.java b/src/main/java/com/incognia/feedback/PostFeedbackRequestBody.java
index e8299d5..e9311da 100644
--- a/src/main/java/com/incognia/feedback/PostFeedbackRequestBody.java
+++ b/src/main/java/com/incognia/feedback/PostFeedbackRequestBody.java
@@ -3,11 +3,13 @@
 import lombok.Builder;
 import lombok.Value;
 
+import java.time.Instant;
+
 @Value
 @Builder
 public class PostFeedbackRequestBody {
   FeedbackEvent event;
-  Long timestamp;
+  Instant occurredAt;
   String accountId;
   String externalId;
   String installationId;
diff --git a/src/test/java/com/incognia/api/IncogniaAPITest.java b/src/test/java/com/incognia/api/IncogniaAPITest.java
index a398186..ea3c0d8 100644
--- a/src/test/java/com/incognia/api/IncogniaAPITest.java
+++ b/src/test/java/com/incognia/api/IncogniaAPITest.java
@@ -556,7 +556,7 @@ void testRegisterFeedback_whenDataIsValid(boolean dryRun) {
             .signupId(signupId)
             .accountId(accountId)
             .event(FeedbackEvent.ACCOUNT_TAKEOVER)
-            .timestamp(timestamp.toEpochMilli())
+            .occurredAt(timestamp)
             .build());
     mockServer.setDispatcher(dispatcher);
     client.registerFeedback(