diff --git a/devops-service/db/mongo/connectors/user.rb b/devops-service/db/mongo/connectors/user.rb
index abbbc7a..5e011c1 100644
--- a/devops-service/db/mongo/connectors/user.rb
+++ b/devops-service/db/mongo/connectors/user.rb
@@ -6,7 +6,6 @@ module Connectors
       Helpers::DeleteCommand,
       Helpers::UpdateCommand
 
-
     def initialize(db)
       self.collection = db.collection('users')
     end
diff --git a/devops-service/report.rb b/devops-service/report.rb
index 9ea22d8..437ad79 100644
--- a/devops-service/report.rb
+++ b/devops-service/report.rb
@@ -14,7 +14,7 @@ class ReportRoutes < Sinatra::Base
     ["project", "deploy_env", "type", "created_by", "date_from", "date_to", "sort", "status"].each do |k|
       options[k] = params[k] unless params[k].nil?
     end
-    json DevopsService.mongo.reports(options).map{|r| r.to_hash}
+    json Devops::Db.connector.reports(options).map{|r| r.to_hash}
 =begin
     res = {}
     uri = URI.parse(request.url)
@@ -39,7 +39,7 @@ class ReportRoutes < Sinatra::Base
   end
 
   get "/:id" do
-    r = DevopsService.mongo.report(params[:id])
+    r = Devops::Db.connector.report(params[:id])
     file = r.file
     return [404, "Report '#{params[:id]}' does not exist"] unless File.exists? file
     @text = File.read(file)
diff --git a/devops-service/routes/v2.0/handlers/user.rb b/devops-service/routes/v2.0/handlers/user.rb
index 33b4feb..0e23d12 100644
--- a/devops-service/routes/v2.0/handlers/user.rb
+++ b/devops-service/routes/v2.0/handlers/user.rb
@@ -9,7 +9,7 @@ module Devops
         def self.get_users
           lambda {
             check_privileges("user", "r")
-            users = settings.mongo.users.map {|i| i.to_hash}
+            users = Devops::Db.connector.users.map {|i| i.to_hash}
             users.each {|u| u.delete("password")}
             json users
           }
@@ -22,7 +22,7 @@ module Devops
             ["username", "password", "email"].each do |p|
               check_string(user[p], "Parameter '#{p}' must be a not empty string")
             end
-            settings.mongo.user_insert User.new(user)
+            Devops::Db.connector.user_insert ::User.new(user)
             create_response("Created", nil, 201)
           }
         end
@@ -30,7 +30,7 @@ module Devops
         def self.delete_user
           lambda {
             check_privileges("user", "w")
-            projects = settings.mongo.projects_by_user params[:user]
+            projects = Devops::Db.connector.projects_by_user params[:user]
             if !projects.empty?
               str = ""
               projects.each do |p|
@@ -43,7 +43,7 @@ module Devops
               #return [400, "Deleting is forbidden: User is included in #{str}"]
             end
 
-            r = settings.mongo.user_delete params[:user]
+            r = Devops::Db.connector.user_delete params[:user]
             create_response("User '#{params[:user]}' removed")
           }
         end
@@ -52,11 +52,11 @@ module Devops
           lambda {
             check_privileges("user", "w")
             data = create_object_from_json_body
-            user = settings.mongo.user params[:user]
+            user = Devops::Db.connector.user params[:user]
             cmd = check_string(data["cmd"], "Parameter 'cmd' should be a not empty string", true) || ""
             privileges = check_string(data["privileges"], "Parameter 'privileges' should be a not empty string", true) || ""
             user.grant(cmd, privileges)
-            settings.mongo.user_update user
+            Devops::Db.connector.user_update user
             create_response("Updated")
           }
         end
@@ -66,15 +66,15 @@ module Devops
             check_privileges("user", "w")
             action = File.basename(request.path)
             u = File.basename(File.dirname(request.path))
-            raise InvalidPrivileges.new("Access denied for '#{request.env['REMOTE_USER']}'") if u == User::ROOT_USER_NAME and request.env['REMOTE_USER'] != User::ROOT_USER_NAME
+            raise InvalidPrivileges.new("Access denied for '#{request.env['REMOTE_USER']}'") if u == ::User::ROOT_USER_NAME and request.env['REMOTE_USER'] != ::User::ROOT_USER_NAME
 
             check_privileges("user", "w") unless request.env['REMOTE_USER'] == u
 
             body = create_object_from_json_body
             p = check_string(body[action], "Parameter '#{action}' must be a not empty string")
-            user = settings.mongo.user u
+            user = Devops::Db.connector.user u
             user.send("#{action}=", p)
-            settings.mongo.user_update user
+            Devops::Db.connector.user_update user
             create_response("Updated")
           }
         end