diff --git a/appinfo/application.php b/appinfo/application.php
index da32ce4..60edf12 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -12,6 +12,7 @@
 namespace OCA\Maps\AppInfo;
 
 
+use OCA\Maps\Db\LocationManager;
 use \OCP\AppFramework\App;
 use \OCA\Maps\Db\CacheManager;
 use \OCA\Maps\Db\DeviceMapper;
@@ -55,6 +56,12 @@ public function __construct (array $urlParams=array()) {
 				$c->query('ServerContainer')->getDb()
 			);
 		});
+
+		$container->registerService('locationManager', function($c) {
+			return new LocationManager(
+				$c->query('ServerContainer')->getDb()
+			);
+		});
 		$container->registerService('LocationMapper', function($c) {
 			return new LocationMapper(
 				$c->query('ServerContainer')->getDb()
@@ -66,16 +73,6 @@ public function __construct (array $urlParams=array()) {
 			);
 		});
 
-		/**
-		 * Core
-		 */
-		$container->registerService('UserId', function($c) {
-			return \OCP\User::getUser();
-		});		
-		$container->registerService('Db', function() {
-			return new Db();
-		});
-		
 	}
 
 
diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php
index 41259a9..7f8f953 100644
--- a/controller/pagecontroller.php
+++ b/controller/pagecontroller.php
@@ -11,6 +11,7 @@
 
 namespace OCA\Maps\Controller;
 
+use OCA\Maps\Db\LocationManager;
 use \OCP\IRequest;
 use \OCP\AppFramework\Http\TemplateResponse;
 use \OCP\AppFramework\Controller;
@@ -21,7 +22,9 @@ class PageController extends Controller {
 	private $userId;
 	private $cacheManager;
 	private $locationManager;
-	public function __construct($appName, IRequest $request, $userId, $cacheManager,$locationManager) {
+	public function __construct($appName, IRequest $request, $userId,
+								CacheManager $cacheManager,
+								LocationManager	$locationManager) {
 		parent::__construct($appName, $request);
 		$this -> userId = $userId;
 		$this -> cacheManager = $cacheManager;
@@ -39,6 +42,7 @@ public function __construct($appName, IRequest $request, $userId, $cacheManager,
 	 * @NoCSRFRequired
 	 */
 	public function index() {
+
 		$params = array('user' => $this -> userId,'devices'=>$this->locationManager->loadAll($this->userId));
 		$response = new TemplateResponse('maps', 'main', $params);
 		if (class_exists('OCP\AppFramework\Http\ContentSecurityPolicy')) {
diff --git a/db/cachemanager.php b/db/cachemanager.php
index dc30876..8d3ed49 100644
--- a/db/cachemanager.php
+++ b/db/cachemanager.php
@@ -16,7 +16,7 @@
 class CacheManager {
 	private $userid;
 	private $db;
-	public function __construct($db) {
+	public function __construct(IDb $db) {
 		$this -> db = $db;
 	}
 
diff --git a/db/locationmanager.php b/db/locationmanager.php
index e3887bf..ae6a080 100755
--- a/db/locationmanager.php
+++ b/db/locationmanager.php
@@ -16,7 +16,7 @@
 class LocationManager {
 	private $userid;
 	private $db;
-	public function __construct($db) {
+	public function __construct(IDb $db) {
 		$this -> db = $db;
 	}