diff --git a/msgphp/eav-bundle/0.1/src/Entity/Eav/Attribute.php b/msgphp/eav-bundle/0.1/src/Entity/Eav/Attribute.php
deleted file mode 100644
index 4b299f3d..00000000
--- a/msgphp/eav-bundle/0.1/src/Entity/Eav/Attribute.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Entity\Eav;
-
-use MsgPhp\Eav\Entity\Attribute as BaseAttribute;
-
-/**
- * @final
- */
-class Attribute extends BaseAttribute
-{
-}
diff --git a/msgphp/eav-bundle/0.1/src/Entity/Eav/AttributeValue.php b/msgphp/eav-bundle/0.1/src/Entity/Eav/AttributeValue.php
deleted file mode 100644
index 59c032ad..00000000
--- a/msgphp/eav-bundle/0.1/src/Entity/Eav/AttributeValue.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Entity\Eav;
-
-use MsgPhp\Eav\Entity\AttributeValue as BaseAttributeValue;
-
-/**
- * @final
- */
-class AttributeValue extends BaseAttributeValue
-{
-}
diff --git a/msgphp/eav-bundle/0.1/config/packages/msgphp_eav.php b/msgphp/eav-bundle/0.2/config/packages/msgphp_eav.php
similarity index 100%
rename from msgphp/eav-bundle/0.1/config/packages/msgphp_eav.php
rename to msgphp/eav-bundle/0.2/config/packages/msgphp_eav.php
diff --git a/msgphp/eav-bundle/0.1/manifest.json b/msgphp/eav-bundle/0.2/manifest.json
similarity index 100%
rename from msgphp/eav-bundle/0.1/manifest.json
rename to msgphp/eav-bundle/0.2/manifest.json
diff --git a/msgphp/eav-bundle/0.2/src/Entity/Eav/Attribute.php b/msgphp/eav-bundle/0.2/src/Entity/Eav/Attribute.php
new file mode 100644
index 00000000..74e10d42
--- /dev/null
+++ b/msgphp/eav-bundle/0.2/src/Entity/Eav/Attribute.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Entity\Eav;
+
+use MsgPhp\Eav\AttributeIdInterface;
+use MsgPhp\Eav\Entity\Attribute as BaseAttribute;
+
+/**
+ * @final
+ */
+class Attribute extends BaseAttribute
+{
+    private $id;
+
+    public function __construct(AttributeIdInterface $id)
+    {
+        $this->id = $id;
+    }
+
+    public function getId(): AttributeIdInterface
+    {
+        return $this->id;
+    }
+}
diff --git a/msgphp/eav-bundle/0.2/src/Entity/Eav/AttributeValue.php b/msgphp/eav-bundle/0.2/src/Entity/Eav/AttributeValue.php
new file mode 100644
index 00000000..bf1d7a74
--- /dev/null
+++ b/msgphp/eav-bundle/0.2/src/Entity/Eav/AttributeValue.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Entity\Eav;
+
+use MsgPhp\Eav\AttributeValueIdInterface;
+use MsgPhp\Eav\Entity\AttributeValue as BaseAttributeValue;
+
+/**
+ * @final
+ */
+class AttributeValue extends BaseAttributeValue
+{
+    private $id;
+
+    public function __construct(AttributeValueIdInterface $id, Attribute $attribute, $value)
+    {
+        parent::__construct($attribute, $value);
+
+        $this->id = $id;
+    }
+
+    public function getId(): AttributeValueIdInterface
+    {
+        return $this->id;
+    }
+}
diff --git a/msgphp/user-bundle/0.1/src/Entity/User/User.php b/msgphp/user-bundle/0.1/src/Entity/User/User.php
deleted file mode 100644
index af358bff..00000000
--- a/msgphp/user-bundle/0.1/src/Entity/User/User.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Entity\User;
-
-use MsgPhp\User\Entity\User as BaseUser;
-
-/**
- * @final
- */
-class User extends BaseUser
-{
-}
diff --git a/msgphp/user-bundle/0.1/config/packages/msgphp_user.php b/msgphp/user-bundle/0.2/config/packages/msgphp_user.php
similarity index 100%
rename from msgphp/user-bundle/0.1/config/packages/msgphp_user.php
rename to msgphp/user-bundle/0.2/config/packages/msgphp_user.php
diff --git a/msgphp/user-bundle/0.1/manifest.json b/msgphp/user-bundle/0.2/manifest.json
similarity index 100%
rename from msgphp/user-bundle/0.1/manifest.json
rename to msgphp/user-bundle/0.2/manifest.json
diff --git a/msgphp/user-bundle/0.2/src/Entity/User/User.php b/msgphp/user-bundle/0.2/src/Entity/User/User.php
new file mode 100644
index 00000000..06152758
--- /dev/null
+++ b/msgphp/user-bundle/0.2/src/Entity/User/User.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Entity\User;
+
+use MsgPhp\User\Entity\User as BaseUser;
+use MsgPhp\User\UserIdInterface;
+
+/**
+ * @final
+ */
+class User extends BaseUser
+{
+    private $id;
+
+    public function __construct(UserIdInterface $id)
+    {
+        $this->id = $id;
+    }
+
+    public function getId(): UserIdInterface
+    {
+        return $this->id;
+    }
+}