diff --git a/Controller/ApiAttributeController.php b/Controller/ApiAttributeController.php
index 9e8abdd..b1f81fd 100644
--- a/Controller/ApiAttributeController.php
+++ b/Controller/ApiAttributeController.php
@@ -71,7 +71,7 @@ final class ApiAttributeController extends Controller
                 ->with('type')
                 ->where('type/id', $type->id)
                 ->where('ref', (int) $request->getData('ref'))
-                ->execute();
+                ->executeCount();
 
             if ($attr > 0) {
                 $response->header->status = RequestStatusCode::R_409;
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 5489bc2..7d25a35 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -209,7 +209,7 @@ final class ApiController extends Controller
         $items = [];
 
         /** @var Item $item */
-        foreach (ItemMapper::yield()->execute() as $item) {
+        foreach (ItemMapper::yield()->executeYield() as $item) {
             $items[] = [
                 'id'    => $item->id,
                 'name1' => $item->getL11n('name1')->content,
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index ada3cab..fde8ad1 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -517,6 +517,7 @@ final class BackendController extends Controller
                 ->execute()
             : [];
 
+        /** @var \Modules\Attribute\Models\AttributeType[] $tmp */
         $tmp = ItemAttributeTypeMapper::getAll()
             ->with('defaults')
             ->with('defaults/l11n')
@@ -537,6 +538,7 @@ final class BackendController extends Controller
 
         $view->data['defaultAttributeTypes'] = $defaultAttributeTypes;
 
+        /** @var \Modules\Attribute\Models\AttributeType[] $tmp */
         $tmp = ClientAttributeTypeMapper::getAll()
             ->with('defaults')
             ->with('defaults/l11n')