diff --git a/pom.xml b/pom.xml
index e0fc436..0ca1e29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -188,6 +188,33 @@
 			<version>4.8.6</version>
 			<scope>compile</scope>
 		</dependency>
+    <!-- Morphia -->
+    <dependency>
+        <groupId>dev.morphia.morphia</groupId>
+        <artifactId>morphia-core</artifactId>
+        <version>2.3.0</version>
+    </dependency>
+
+    <!-- MongoDB Java Driver -->
+    <dependency>
+        <groupId>org.mongodb</groupId>
+        <artifactId>mongodb-driver-sync</artifactId>
+        <version>4.3.0</version>
+    </dependency>
+
+
+    <!-- Bean Validation (JSR 303 / 380) -->
+    <dependency>
+        <groupId>org.hibernate.validator</groupId>
+        <artifactId>hibernate-validator</artifactId>
+        <version>7.0.0.Final</version>
+    </dependency>
+
+    <dependency>
+        <groupId>javax.validation</groupId>
+        <artifactId>validation-api</artifactId>
+        <version>2.0.1.Final</version>
+    </dependency>
 		<!--
 		************************************************************ 
 		** TEST dependency                                        **
diff --git a/src/org/kar/archidata/annotation/ARCHIVE.java b/src/org/kar/archidata/annotation/ARCHIVE.java
new file mode 100644
index 0000000..dbd8f55
--- /dev/null
+++ b/src/org/kar/archidata/annotation/ARCHIVE.java
@@ -0,0 +1,19 @@
+package org.kar.archidata.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import jakarta.ws.rs.HttpMethod;
+
+/**
+* Indicates that the annotated method responds to HTTP ARCHIVE requests.
+*
+* @author Edouard DUPIN
+* @see HttpMethod
+*/
+@Target({ ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@HttpMethod("ARCHIVE")
+public @interface ARCHIVE {}
diff --git a/src/org/kar/archidata/annotation/RESTORE.java b/src/org/kar/archidata/annotation/RESTORE.java
new file mode 100644
index 0000000..df63650
--- /dev/null
+++ b/src/org/kar/archidata/annotation/RESTORE.java
@@ -0,0 +1,19 @@
+package org.kar.archidata.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import jakarta.ws.rs.HttpMethod;
+
+/**
+* Indicates that the annotated method responds to HTTP RESTORE requests.
+*
+* @author Edouard DUPIN
+* @see HttpMethod
+*/
+@Target({ ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@HttpMethod("RESTORE")
+public @interface RESTORE {}
diff --git a/src/org/kar/archidata/model/GenericData.java b/src/org/kar/archidata/model/GenericData.java
index dacedb0..4749023 100644
--- a/src/org/kar/archidata/model/GenericData.java
+++ b/src/org/kar/archidata/model/GenericData.java
@@ -1,5 +1,7 @@
 package org.kar.archidata.model;
 
+import org.bson.types.ObjectId;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.Column;
 import jakarta.persistence.GeneratedValue;
@@ -7,6 +9,8 @@ import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 
 public class GenericData extends GenericTiming {
+	@dev.morphia.annotations.Id
+	private ObjectId _id;
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Column(nullable = false, unique = true)
diff --git a/src/org/kar/archidata/tools/DataTools.java b/src/org/kar/archidata/tools/DataTools.java
index 08db2d0..60f7ce1 100644
--- a/src/org/kar/archidata/tools/DataTools.java
+++ b/src/org/kar/archidata/tools/DataTools.java
@@ -259,6 +259,9 @@ public class DataTools {
 		if (data.contentEquals("null")) {
 			return null;
 		}
+		if (data.contentEquals("undefined")) {
+			return null;
+		}
 		return data;
 	}