diff --git a/Classes/Controller/AbstractController.php b/Classes/Controller/AbstractController.php
index 526287e05e98383f17037636d74d7d3c9385eb27..27101357c42cdec3d1d395628506f22bf5f06f46 100644
--- a/Classes/Controller/AbstractController.php
+++ b/Classes/Controller/AbstractController.php
@@ -29,7 +29,7 @@ namespace SGalinski\SgNews\Controller;
 use RuntimeException;
 use SGalinski\SgNews\Domain\Model\Category;
 use SGalinski\SgNews\Domain\Model\News;
-use SGalinski\SgNews\Utility\ExtensionUtility;
+use SGalinski\SgNews\Service\ImageService;
 use TYPO3\CMS\Extbase\Domain\Model\FileReference;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 
@@ -38,8 +38,7 @@ use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
  */
 abstract class AbstractController extends ActionController {
 	/**
-	 * @inject
-	 * @var \SGalinski\SgNews\Service\ImageService
+	 * @var ImageService
 	 */
 	protected $imageService;
 
@@ -65,6 +64,13 @@ abstract class AbstractController extends ActionController {
 		parent::initializeAction();
 	}
 
+	/**
+	 * @param ImageService $imageService
+	 */
+	public function injectImageService(ImageService $imageService) {
+		$this->imageService = $imageService;
+	}
+
 	/**
 	 * Error Handler
 	 *
diff --git a/Classes/Controller/LatestController.php b/Classes/Controller/LatestController.php
index 2221c06038c42a287cf6438602945f7fe830ee95..9dbfd3be2af3280b1ad0f418bdb1d890feb0890d 100644
--- a/Classes/Controller/LatestController.php
+++ b/Classes/Controller/LatestController.php
@@ -28,6 +28,9 @@ namespace SGalinski\SgNews\Controller;
 
 use SGalinski\SgNews\Domain\Model\Category;
 use SGalinski\SgNews\Domain\Model\News;
+use SGalinski\SgNews\Domain\Repository\CategoryRepository;
+use SGalinski\SgNews\Domain\Repository\NewsRepository;
+use SGalinski\SgNews\Domain\Repository\TagRepository;
 use SGalinski\SgNews\Service\ConfigurationService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
@@ -36,20 +39,17 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  */
 class LatestController extends AbstractController {
 	/**
-	 * @inject
-	 * @var \SGalinski\SgNews\Domain\Repository\CategoryRepository
+	 * @var CategoryRepository
 	 */
 	protected $categoryRepository;
 
 	/**
-	 * @inject
-	 * @var \SGalinski\SgNews\Domain\Repository\TagRepository
+	 * @var TagRepository
 	 */
 	protected $tagRepository;
 
 	/**
-	 * @inject
-	 * @var \SGalinski\SgNews\Domain\Repository\NewsRepository
+	 * @var NewsRepository
 	 */
 	protected $newsRepository;
 
@@ -118,4 +118,26 @@ class LatestController extends AbstractController {
 
 		$this->view->assign('newsMetaData', $newsMetaData);
 	}
+
+	/**
+	 * @param CategoryRepository $categoryRepository
+	 */
+	public function injectCategoryRepository(CategoryRepository $categoryRepository
+	) {
+		$this->categoryRepository = $categoryRepository;
+	}
+
+	/**
+	 * @param NewsRepository $newsRepository
+	 */
+	public function injectNewsRepository(NewsRepository $newsRepository) {
+		$this->newsRepository = $newsRepository;
+	}
+
+	/**
+	 * @param TagRepository $tagRepository
+	 */
+	public function injectTagRepository(TagRepository $tagRepository) {
+		$this->tagRepository = $tagRepository;
+	}
 }
diff --git a/Classes/Controller/ListByCategoryController.php b/Classes/Controller/ListByCategoryController.php
index 86829008000737ffea6ed797ffab0be27e9d4b0e..65f77a6fc76b38998697a4f0f38b2ed47a7162c4 100644
--- a/Classes/Controller/ListByCategoryController.php
+++ b/Classes/Controller/ListByCategoryController.php
@@ -27,6 +27,9 @@ namespace SGalinski\SgNews\Controller;
  ***************************************************************/
 
 use SGalinski\SgNews\Domain\Model\News;
+use SGalinski\SgNews\Domain\Repository\CategoryRepository;
+use SGalinski\SgNews\Domain\Repository\NewsRepository;
+use SGalinski\SgNews\Domain\Repository\TagRepository;
 use SGalinski\SgNews\Service\ConfigurationService;
 use SGalinski\SgNews\Service\HeaderMetaDataService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -37,20 +40,17 @@ use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
  */
 class ListByCategoryController extends AbstractController {
 	/**
-	 * @inject
-	 * @var \SGalinski\SgNews\Domain\Repository\CategoryRepository
+	 * @var CategoryRepository
 	 */
 	protected $categoryRepository;
 
 	/**
-	 * @inject
-	 * @var \SGalinski\SgNews\Domain\Repository\TagRepository
+	 * @var TagRepository
 	 */
 	protected $tagRepository;
 
 	/**
-	 * @inject
-	 * @var \SGalinski\SgNews\Domain\Repository\NewsRepository
+	 * @var NewsRepository
 	 */
 	protected $newsRepository;
 
@@ -66,6 +66,28 @@ class ListByCategoryController extends AbstractController {
 		}
 	}
 
+	/**
+	 * @param CategoryRepository $categoryRepository
+	 */
+	public function injectCategoryRepository(CategoryRepository $categoryRepository
+	) {
+		$this->categoryRepository = $categoryRepository;
+	}
+
+	/**
+	 * @param NewsRepository $newsRepository
+	 */
+	public function injectNewsRepository(NewsRepository $newsRepository) {
+		$this->newsRepository = $newsRepository;
+	}
+
+	/**
+	 * @param TagRepository $tagRepository
+	 */
+	public function injectTagRepository(TagRepository $tagRepository) {
+		$this->tagRepository = $tagRepository;
+	}
+
 	/**
 	 * Renders the news list of a category
 	 *
diff --git a/Classes/Controller/NewsFeedController.php b/Classes/Controller/NewsFeedController.php
index 21a1f85e97440aad042c2c4db63f9e3c5edd0c00..6278c9adbfaca33f6d51999d700d327c369e4099 100644
--- a/Classes/Controller/NewsFeedController.php
+++ b/Classes/Controller/NewsFeedController.php
@@ -26,6 +26,7 @@ namespace SGalinski\SgNews\Controller;
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
+use SGalinski\SgNews\Domain\Repository\NewsRepository;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
@@ -33,8 +34,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  */
 class NewsFeedController extends AbstractController {
 	/**
-	 * @inject
-	 * @var \SGalinski\SgNews\Domain\Repository\NewsRepository
+	 * @var NewsRepository
 	 */
 	protected $newsRepository;
 
@@ -53,4 +53,11 @@ class NewsFeedController extends AbstractController {
 		);
 		$this->view->assign('news', $news);
 	}
+
+	/**
+	 * @param NewsRepository $newsRepository
+	 */
+	public function injectNewsRepository(NewsRepository $newsRepository) {
+		$this->newsRepository = $newsRepository;
+	}
 }
diff --git a/Classes/Controller/OverviewController.php b/Classes/Controller/OverviewController.php
index 16a74fda1d4bd14e5178c46a5c9d14367aa6e5c0..a4d7b4e284718e1a34b4e303b88cd67979461d0f 100644
--- a/Classes/Controller/OverviewController.php
+++ b/Classes/Controller/OverviewController.php
@@ -29,6 +29,9 @@ namespace SGalinski\SgNews\Controller;
 use SGalinski\SgNews\Domain\Model\Category;
 use SGalinski\SgNews\Domain\Model\Tag;
 use SGalinski\SgNews\Domain\Model\News;
+use SGalinski\SgNews\Domain\Repository\CategoryRepository;
+use SGalinski\SgNews\Domain\Repository\NewsRepository;
+use SGalinski\SgNews\Domain\Repository\TagRepository;
 use SGalinski\SgNews\Service\ConfigurationService;
 use SGalinski\SgNews\Service\HeaderMetaDataService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -41,20 +44,17 @@ use TYPO3\CMS\Extbase\Persistence\QueryInterface;
  */
 class OverviewController extends AbstractController {
 	/**
-	 * @inject
-	 * @var \SGalinski\SgNews\Domain\Repository\CategoryRepository
+	 * @var CategoryRepository
 	 */
 	protected $categoryRepository;
 
 	/**
-	 * @inject
-	 * @var \SGalinski\SgNews\Domain\Repository\TagRepository
+	 * @var TagRepository
 	 */
 	protected $tagRepository;
 
 	/**
-	 * @inject
-	 * @var \SGalinski\SgNews\Domain\Repository\NewsRepository
+	 * @var NewsRepository
 	 */
 	protected $newsRepository;
 
@@ -450,6 +450,28 @@ class OverviewController extends AbstractController {
 		}
 	}
 
+	/**
+	 * @param CategoryRepository $categoryRepository
+	 */
+	public function injectCategoryRepository(CategoryRepository $categoryRepository
+	) {
+		$this->categoryRepository = $categoryRepository;
+	}
+
+	/**
+	 * @param NewsRepository $newsRepository
+	 */
+	public function injectNewsRepository(NewsRepository $newsRepository) {
+		$this->newsRepository = $newsRepository;
+	}
+
+	/**
+	 * @param TagRepository $tagRepository
+	 */
+	public function injectTagRepository(TagRepository $tagRepository) {
+		$this->tagRepository = $tagRepository;
+	}
+
 	/**
 	 * Renders the news in a paginated list
 	 *
diff --git a/Classes/Controller/SingleViewController.php b/Classes/Controller/SingleViewController.php
index 9883f08416de0a92bd1dbbb10da555262ffa305f..16587afde8a096dd9bf74bdcfd59a08a7a3153de 100644
--- a/Classes/Controller/SingleViewController.php
+++ b/Classes/Controller/SingleViewController.php
@@ -28,33 +28,33 @@ namespace SGalinski\SgNews\Controller;
 
 use SGalinski\SgNews\Domain\Model\Category;
 use SGalinski\SgNews\Domain\Model\News;
+use SGalinski\SgNews\Domain\Repository\CategoryRepository;
+use SGalinski\SgNews\Domain\Repository\NewsRepository;
+use SGalinski\SgNews\Domain\Repository\TagRepository;
 use SGalinski\SgNews\Service\HeaderMetaDataService;
+use TYPO3\CMS\Core\Charset\CharsetConverter;
 
 /**
  * Controller that handles the news single view page
  */
 class SingleViewController extends AbstractController {
 	/**
-	 * @inject
-	 * @var \SGalinski\SgNews\Domain\Repository\CategoryRepository
+	 * @var CategoryRepository
 	 */
 	protected $categoryRepository;
 
 	/**
-	 * @inject
-	 * @var \SGalinski\SgNews\Domain\Repository\TagRepository
+	 * @var TagRepository
 	 */
 	protected $tagRepository;
 
 	/**
-	 * @inject
-	 * @var \SGalinski\SgNews\Domain\Repository\NewsRepository
+	 * @var NewsRepository
 	 */
 	protected $newsRepository;
 
 	/**
-	 * @inject
-	 * @var \TYPO3\CMS\Core\Charset\CharsetConverter
+	 * @var CharsetConverter
 	 */
 	protected $characterSetConverter;
 
@@ -113,4 +113,33 @@ class SingleViewController extends AbstractController {
 			]
 		);
 	}
+
+	/**
+	 * @param CategoryRepository $categoryRepository
+	 */
+	public function injectCategoryRepository(CategoryRepository $categoryRepository
+	) {
+		$this->categoryRepository = $categoryRepository;
+	}
+
+	/**
+	 * @param CharsetConverter $characterSetConverter
+	 */
+	public function injectCharacterSetConverter(CharsetConverter $characterSetConverter) {
+		$this->characterSetConverter = $characterSetConverter;
+	}
+
+	/**
+	 * @param NewsRepository $newsRepository
+	 */
+	public function injectNewsRepository(NewsRepository $newsRepository) {
+		$this->newsRepository = $newsRepository;
+	}
+
+	/**
+	 * @param TagRepository $tagRepository
+	 */
+	public function injectTagRepository(TagRepository $tagRepository) {
+		$this->tagRepository = $tagRepository;
+	}
 }
diff --git a/Classes/Service/ImageService.php b/Classes/Service/ImageService.php
index b96887b19a8d323092bee9387826c034ef8c7f41..cfa9621feff87d5d585de5ead0c894f4a5bcc212 100644
--- a/Classes/Service/ImageService.php
+++ b/Classes/Service/ImageService.php
@@ -26,6 +26,7 @@ namespace SGalinski\SgNews\Service;
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
+use TYPO3\CMS\Core\Charset\CharsetConverter;
 use TYPO3\CMS\Core\SingletonInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Domain\Model\FileReference;
@@ -35,8 +36,7 @@ use TYPO3\CMS\Extbase\Domain\Model\FileReference;
  */
 class ImageService implements SingletonInterface {
 	/**
-	 * @inject
-	 * @var \TYPO3\CMS\Core\Charset\CharsetConverter
+	 * @var CharsetConverter
 	 */
 	protected $characterSetConverter;
 
@@ -92,4 +92,11 @@ class ImageService implements SingletonInterface {
 
 		return $croppedImage;
 	}
+
+	/**
+	 * @param CharsetConverter $characterSetConverter
+	 */
+	public function injectCharacterSetConverter(CharsetConverter $characterSetConverter) {
+		$this->characterSetConverter = $characterSetConverter;
+	}
 }