diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 52a362d..1e0aeed 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -261,17 +261,17 @@ final class BackendController extends Controller
 
         if ($request->getData('ptype') === 'p') {
             $view->setData('costcenter',
-                CostCenterMapper::withConditional('language', $response->getLanguage())
+                CostCenterMapper::with('language', $response->getLanguage())
                     ::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25)
             );
         } elseif ($request->getData('ptype') === 'n') {
             $view->setData('costcenter',
-                CostCenterMapper::withConditional('language', $response->getLanguage())
+                CostCenterMapper::with('language', $response->getLanguage())
                     ::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25)
             );
         } else {
             $view->setData('costcenter',
-                CostCenterMapper::withConditional('language', $response->getLanguage())
+                CostCenterMapper::with('language', $response->getLanguage())
                     ::getAfterPivot(0, null, 25)
             );
         }
@@ -299,17 +299,17 @@ final class BackendController extends Controller
 
         if ($request->getData('ptype') === 'p') {
             $view->setData('costobject',
-                CostObjectMapper::withConditional('language', $response->getLanguage())
+                CostObjectMapper::with('language', $response->getLanguage())
                     ::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25)
             );
         } elseif ($request->getData('ptype') === 'n') {
             $view->setData('costobject',
-                CostObjectMapper::withConditional('language', $response->getLanguage())
+                CostObjectMapper::with('language', $response->getLanguage())
                     ::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25)
             );
         } else {
             $view->setData('costobject',
-                CostObjectMapper::withConditional('language', $response->getLanguage())
+                CostObjectMapper::with('language', $response->getLanguage())
                     ::getAfterPivot(0, null, 25)
             );
         }
diff --git a/tests/Models/CostCenterMapperTest.php b/tests/Models/CostCenterMapperTest.php
index df05215..875c45e 100755
--- a/tests/Models/CostCenterMapperTest.php
+++ b/tests/Models/CostCenterMapperTest.php
@@ -38,7 +38,7 @@ class CostCenterMapperTest extends \PHPUnit\Framework\TestCase
         self::assertGreaterThan(0, $costcenter->getId());
         self::assertEquals($id, $costcenter->getId());
 
-        $costcenterR = CostCenterMapper::withConditional('language', ISO639x1Enum::_EN)::get($costcenter->getId());
+        $costcenterR = CostCenterMapper::with('language', ISO639x1Enum::_EN)::get($costcenter->getId());
         self::assertEquals($costcenter->code, $costcenterR->code);
         self::assertEquals($costcenter->l11n->name, $costcenterR->l11n->name);
         self::assertEquals($costcenter->l11n->description, $costcenterR->l11n->description);
diff --git a/tests/Models/CostObjectMapperTest.php b/tests/Models/CostObjectMapperTest.php
index 02d24eb..e854f0e 100755
--- a/tests/Models/CostObjectMapperTest.php
+++ b/tests/Models/CostObjectMapperTest.php
@@ -38,7 +38,7 @@ class CostObjectMapperTest extends \PHPUnit\Framework\TestCase
         self::assertGreaterThan(0, $costobject->getId());
         self::assertEquals($id, $costobject->getId());
 
-        $costobjectR = CostObjectMapper::withConditional('language', ISO639x1Enum::_EN)::get($costobject->getId());
+        $costobjectR = CostObjectMapper::with('language', ISO639x1Enum::_EN)::get($costobject->getId());
         self::assertEquals($costobject->code, $costobjectR->code);
         self::assertEquals($costobject->l11n->name, $costobjectR->l11n->name);
         self::assertEquals($costobject->l11n->description, $costobjectR->l11n->description);