diff --git a/src/Model/Entity/Store/ProductProperty.php b/src/Model/Entity/Store/ProductProperty.php
new file mode 100644
index 0000000..86395b9
--- /dev/null
+++ b/src/Model/Entity/Store/ProductProperty.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * PHP version 7.3
+ *
+ * @category ProductProperty
+ * @package  RetailCrm\Api\Model\Entity\Store
+ */
+
+namespace RetailCrm\Api\Model\Entity\Store;
+
+use RetailCrm\Api\Component\Serializer\Annotation as JMS;
+
+/**
+ * Class ProductProperty
+ *
+ * @category ProductProperty
+ * @package  RetailCrm\Api\Model\Entity\Store
+ */
+class ProductProperty
+{
+    /**
+     * @var string[]
+     *
+     * @JMS\Type("array<string>")
+     * @JMS\SerializedName("sites")
+     */
+    public $sites;
+
+    /**
+     * @var \RetailCrm\Api\Model\Entity\Store\ProductPropertyGroup[]
+     *
+     * @JMS\Type("array<RetailCrm\Api\Model\Entity\Store\ProductPropertyGroup>")
+     * @JMS\SerializedName("groups")
+     */
+    public $groups;
+
+    /**
+     * @var string
+     *
+     * @JMS\Type("string")
+     * @JMS\SerializedName("code")
+     */
+    public $code;
+
+    /**
+     * @var string
+     *
+     * @JMS\Type("string")
+     * @JMS\SerializedName("name")
+     */
+    public $name;
+
+    /**
+     * @var bool
+     *
+     * @JMS\Type("bool")
+     * @JMS\SerializedName("isNumeric")
+     */
+    public $isNumeric;
+}
diff --git a/src/Model/Entity/Store/ProductPropertyGroup.php b/src/Model/Entity/Store/ProductPropertyGroup.php
new file mode 100644
index 0000000..b0f035e
--- /dev/null
+++ b/src/Model/Entity/Store/ProductPropertyGroup.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * PHP version 7.3
+ *
+ * @category ProductPropertyGroup
+ * @package  RetailCrm\Api\Model\Entity\Store
+ */
+
+namespace RetailCrm\Api\Model\Entity\Store;
+
+use RetailCrm\Api\Component\Serializer\Annotation as JMS;
+
+/**
+ * Class ProductPropertyGroup
+ *
+ * @category ProductPropertyGroup
+ * @package  RetailCrm\Api\Model\Entity\Store
+ */
+class ProductPropertyGroup
+{
+    /**
+     * @var int
+     *
+     * @JMS\Type("int")
+     * @JMS\SerializedName("id")
+     */
+    public $id;
+
+    /**
+     * @var string
+     *
+     * @JMS\Type("string")
+     * @JMS\SerializedName("name")
+     */
+    public $name;
+}
diff --git a/src/Model/Filter/Store/ProductProperty.php b/src/Model/Filter/Store/ProductProperty.php
index 1b8025b..d6c7fa0 100644
--- a/src/Model/Filter/Store/ProductProperty.php
+++ b/src/Model/Filter/Store/ProductProperty.php
@@ -9,53 +9,15 @@
 
 namespace RetailCrm\Api\Model\Filter\Store;
 
-use RetailCrm\Api\Component\Serializer\Annotation as JMS;
+use RetailCrm\Api\Model\Entity\Store\ProductProperty as Base;
 
 /**
  * Class ProductProperty
  *
  * @category ProductProperty
  * @package  RetailCrm\Api\Model\Filter\Store
+ * @deprecated Please use RetailCrm\Api\Model\Entity\Store\ProductProperty instead.
  */
-class ProductProperty
+class ProductProperty extends Base
 {
-    /**
-     * @var string[]
-     *
-     * @JMS\Type("array<string>")
-     * @JMS\SerializedName("sites")
-     */
-    public $sites;
-
-    /**
-     * @var \RetailCrm\Api\Model\Filter\Store\ProductPropertyGroup[]
-     *
-     * @JMS\Type("array<RetailCrm\Api\Model\Filter\Store\ProductPropertyGroup>")
-     * @JMS\SerializedName("groups")
-     */
-    public $groups;
-
-    /**
-     * @var string
-     *
-     * @JMS\Type("string")
-     * @JMS\SerializedName("code")
-     */
-    public $code;
-
-    /**
-     * @var string
-     *
-     * @JMS\Type("string")
-     * @JMS\SerializedName("name")
-     */
-    public $name;
-
-    /**
-     * @var bool
-     *
-     * @JMS\Type("bool")
-     * @JMS\SerializedName("isNumeric")
-     */
-    public $isNumeric;
 }
diff --git a/src/Model/Filter/Store/ProductPropertyGroup.php b/src/Model/Filter/Store/ProductPropertyGroup.php
index f2467b1..14a025e 100644
--- a/src/Model/Filter/Store/ProductPropertyGroup.php
+++ b/src/Model/Filter/Store/ProductPropertyGroup.php
@@ -9,29 +9,15 @@
 
 namespace RetailCrm\Api\Model\Filter\Store;
 
-use RetailCrm\Api\Component\Serializer\Annotation as JMS;
+use RetailCrm\Api\Model\Entity\Store\ProductPropertyGroup as Base;
 
 /**
  * Class ProductPropertyGroup
  *
  * @category ProductPropertyGroup
  * @package  RetailCrm\Api\Model\Filter\Store
+ * @deprecated Please use RetailCrm\Api\Model\Entity\Store\ProductPropertyGroup instead.
  */
-class ProductPropertyGroup
+class ProductPropertyGroup extends Base
 {
-    /**
-     * @var int
-     *
-     * @JMS\Type("int")
-     * @JMS\SerializedName("id")
-     */
-    public $id;
-
-    /**
-     * @var string
-     *
-     * @JMS\Type("string")
-     * @JMS\SerializedName("name")
-     */
-    public $name;
 }
diff --git a/src/Model/Response/Store/ProductPropertiesResponse.php b/src/Model/Response/Store/ProductPropertiesResponse.php
index 877d264..3f2b493 100644
--- a/src/Model/Response/Store/ProductPropertiesResponse.php
+++ b/src/Model/Response/Store/ProductPropertiesResponse.php
@@ -21,9 +21,9 @@ use RetailCrm\Api\Model\Response\AbstractPaginatedResponse;
 class ProductPropertiesResponse extends AbstractPaginatedResponse
 {
     /**
-     * @var \RetailCrm\Api\Model\Filter\Store\ProductProperty[]
+     * @var \RetailCrm\Api\Model\Entity\Store\ProductProperty[]
      *
-     * @JMS\Type("array<RetailCrm\Api\Model\Filter\Store\ProductProperty>")
+     * @JMS\Type("array<RetailCrm\Api\Model\Entity\Store\ProductProperty>")
      * @JMS\SerializedName("properties")
      */
     public $properties;