diff --git a/myconext-server/src/main/java/myconext/model/ChangeEmailHash.java b/myconext-server/src/main/java/myconext/model/ChangeEmailHash.java
index 0fb9c544..92ee3cff 100644
--- a/myconext-server/src/main/java/myconext/model/ChangeEmailHash.java
+++ b/myconext-server/src/main/java/myconext/model/ChangeEmailHash.java
@@ -1,5 +1,6 @@
 package myconext.model;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.springframework.data.annotation.Id;
@@ -20,6 +21,7 @@ public class ChangeEmailHash implements Serializable {
 
     private String hash;
 
+    @Schema(type = "integer", format = "int64", example = "1634813554997")
     private Date expiresIn;
 
     private String userId;
diff --git a/myconext-server/src/main/java/myconext/model/EmailsSend.java b/myconext-server/src/main/java/myconext/model/EmailsSend.java
index c1ef9de2..b6872330 100644
--- a/myconext-server/src/main/java/myconext/model/EmailsSend.java
+++ b/myconext-server/src/main/java/myconext/model/EmailsSend.java
@@ -1,9 +1,9 @@
 package myconext.model;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.io.Serializable;
@@ -19,6 +19,7 @@ public class EmailsSend implements Serializable {
 
     private String email;
 
+    @Schema(type = "integer", format = "int64", example = "1634813554997")
     private Date sendAt;
 
     public EmailsSend(String email) {
diff --git a/myconext-server/src/main/java/myconext/model/MobileLinkAccountRequest.java b/myconext-server/src/main/java/myconext/model/MobileLinkAccountRequest.java
index d2d40a2c..8d72d89b 100644
--- a/myconext-server/src/main/java/myconext/model/MobileLinkAccountRequest.java
+++ b/myconext-server/src/main/java/myconext/model/MobileLinkAccountRequest.java
@@ -1,5 +1,6 @@
 package myconext.model;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.springframework.data.annotation.Id;
@@ -9,7 +10,6 @@
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Date;
-import java.util.Map;
 
 @NoArgsConstructor
 @Getter
@@ -23,6 +23,7 @@ public class MobileLinkAccountRequest implements Serializable {
 
     private String userId;
 
+    @Schema(type = "integer", format = "int64", example = "1634813554997")
     private Date expiresIn;
 
     public MobileLinkAccountRequest(String hash, String userId) {
diff --git a/myconext-server/src/main/java/myconext/model/PasswordResetHash.java b/myconext-server/src/main/java/myconext/model/PasswordResetHash.java
index 72040c4f..22ae9c1c 100644
--- a/myconext-server/src/main/java/myconext/model/PasswordResetHash.java
+++ b/myconext-server/src/main/java/myconext/model/PasswordResetHash.java
@@ -1,5 +1,6 @@
 package myconext.model;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.springframework.data.annotation.Id;
@@ -21,6 +22,7 @@ public class PasswordResetHash implements Serializable {
 
     private String hash;
 
+    @Schema(type = "integer", format = "int64", example = "1634813554997")
     private Date expiresIn;
 
     private String userId;
diff --git a/myconext-server/src/main/java/myconext/model/RequestInstitutionEduID.java b/myconext-server/src/main/java/myconext/model/RequestInstitutionEduID.java
index d60b04c1..839c1d47 100644
--- a/myconext-server/src/main/java/myconext/model/RequestInstitutionEduID.java
+++ b/myconext-server/src/main/java/myconext/model/RequestInstitutionEduID.java
@@ -1,5 +1,6 @@
 package myconext.model;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
@@ -25,6 +26,7 @@ public class RequestInstitutionEduID implements Serializable {
     @Setter
     private String emailHash;
 
+    @Schema(type = "integer", format = "int64", example = "1634813554997")
     private Date expiresIn;
 
     private Map<String, Object> userInfo;
diff --git a/myconext-server/src/main/java/myconext/model/SamlAuthenticationRequest.java b/myconext-server/src/main/java/myconext/model/SamlAuthenticationRequest.java
index cda5f660..58eca2f1 100644
--- a/myconext-server/src/main/java/myconext/model/SamlAuthenticationRequest.java
+++ b/myconext-server/src/main/java/myconext/model/SamlAuthenticationRequest.java
@@ -1,5 +1,6 @@
 package myconext.model;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.springframework.data.annotation.Id;
@@ -35,6 +36,7 @@ public class SamlAuthenticationRequest implements Serializable {
     @Indexed
     private String hash;
 
+    @Schema(type = "integer", format = "int64", example = "1634813554997")
     private Date expiresIn;
 
     private String userId;
diff --git a/myconext-server/src/main/java/myconext/model/UserResponse.java b/myconext-server/src/main/java/myconext/model/UserResponse.java
index 044b49b2..1f8e7000 100644
--- a/myconext-server/src/main/java/myconext/model/UserResponse.java
+++ b/myconext-server/src/main/java/myconext/model/UserResponse.java
@@ -1,5 +1,6 @@
 package myconext.model;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import myconext.manage.Manage;
 import myconext.tiqr.SURFSecureID;
@@ -20,6 +21,7 @@ public class UserResponse implements Serializable {
     private final String chosenName;
     private final String familyName;
     private final String givenName;
+    @Schema(type = "integer", format = "int64", example = "1634813554997")
     private final Date dateOfBirth;
     private final boolean givenNameVerified;
     private final String displayName;