diff --git a/Model/RequestCalculate.php b/Model/RequestCalculate.php
index 63acab0..7f9c94b 100644
--- a/Model/RequestCalculate.php
+++ b/Model/RequestCalculate.php
@@ -11,7 +11,7 @@ class RequestCalculate
     /**
      * Адрес отгрузки.
      *
-     * @var RetailCrm\DeliveryModuleBundle\Model\DeliveryAddress
+     * @var DeliveryAddress
      *
      * @Serializer\Groups({"request", "calculate"})
      * @Serializer\SerializedName("shipmentAddress")
@@ -33,7 +33,7 @@ class RequestCalculate
     /**
      * Набор упаковок.
      *
-     * @var RetailCrm\DeliveryModuleBundle\Model\Package[]
+     * @var Package[]
      *
      * @Serializer\Groups({"request", "calculate"})
      * @Serializer\SerializedName("packages")
diff --git a/Model/ResponseLoadDeliveryData.php b/Model/ResponseLoadDeliveryData.php
index ccca5f1..7a6491d 100644
--- a/Model/ResponseLoadDeliveryData.php
+++ b/Model/ResponseLoadDeliveryData.php
@@ -50,7 +50,7 @@ class ResponseLoadDeliveryData
 
     /**
      * Время доставки
-     * @var RetailCrm\DeliveryModuleBundle\Model\DeliveryTime
+     * @var DeliveryTime
      *
      * @Serializer\Groups({"response"})
      * @Serializer\SerializedName("deliveryTime")
diff --git a/Model/Settings.php b/Model/Settings.php
index b97c484..4464a85 100644
--- a/Model/Settings.php
+++ b/Model/Settings.php
@@ -3,7 +3,6 @@
 namespace RetailCrm\DeliveryModuleBundle\Model;
 
 use JMS\Serializer\Annotation as Serializer;
-use RetailCrm\DeliveryModuleBundle\Model\Settings\ExtraData;
 use RetailCrm\DeliveryModuleBundle\Model\Settings\PaymentType;
 use RetailCrm\DeliveryModuleBundle\Model\Settings\ShipmentPoint;
 use RetailCrm\DeliveryModuleBundle\Model\Settings\Status;
@@ -77,7 +76,7 @@ class Settings
     public $statuses;
 
     /**
-     * @var array|ExtraData[]
+     * @var array
      *
      * @Serializer\Groups({"set", "get"})
      * @Serializer\SerializedName("deliveryExtraData")
@@ -86,7 +85,7 @@ class Settings
     public $deliveryExtraData;
 
     /**
-     * @var array|ExtraData[]
+     * @var array
      *
      * @Serializer\Groups({"set", "get"})
      * @Serializer\SerializedName("shipmentExtraData")
diff --git a/Model/Unit.php b/Model/Unit.php
index 4f45d32..c46abe8 100644
--- a/Model/Unit.php
+++ b/Model/Unit.php
@@ -2,6 +2,8 @@
 
 namespace RetailCrm\DeliveryModuleBundle\Model;
 
+use JMS\Serializer\Annotation as Serializer;
+
 class Unit
 {
     /**