diff --git a/devops-service/routes/v2.0/handlers/project.rb b/devops-service/routes/v2.0/handlers/project.rb
index 47f9c92..a122742 100644
--- a/devops-service/routes/v2.0/handlers/project.rb
+++ b/devops-service/routes/v2.0/handlers/project.rb
@@ -75,7 +75,7 @@ module Devops
             project.id = params[:project]
             old_project = settings.mongo.project params[:project]
             settings.mongo.project_update project
-            roles = Devops::Model::Project.create_new_roles(old_project, project, logger)
+            roles = Devops::Version2_0::Handler::Project.create_new_roles(old_project, project, logger)
             info = "Project '#{project.id}' has been updated." + Project.create_roles_response(roles)
             create_response(info)
           }
@@ -138,9 +138,9 @@ module Devops
               "Project '#{params[:project]}' is deleted"
             else
               project = settings.mongo.project(params[:project])
-              project.remove_env params[:deploy_env]
+              project.remove_env deploy_env
               settings.mongo.project_update project
-              "Project '#{params[:project]}'. Deploy environment '#{params[:deploy_env]}' has been deleted"
+              "Project '#{params[:project]}'. Deploy environment '#{deploy_env}' has been deleted"
             end
             create_response(info)
           }
@@ -284,7 +284,7 @@ module Devops
           old_project.deploy_envs.each do |e|
             new_project.remove_env(e.identifier)
           end
-          Devops::Model::Project.create_roles new_project.id, new_project.deploy_envs, logger
+          Devops::Version2_0::Handler::Project.create_roles new_project.id, new_project.deploy_envs, logger
         end
 
         def self.create_roles_response roles
diff --git a/devops-service/routes/v2.0/handlers/server.rb b/devops-service/routes/v2.0/handlers/server.rb
index 82354c6..800d7d2 100644
--- a/devops-service/routes/v2.0/handlers/server.rb
+++ b/devops-service/routes/v2.0/handlers/server.rb
@@ -98,7 +98,7 @@ module Devops
               halt_response("Invalid security groups '#{buf.join("', '")}' for provider '#{provider.name}'") if buf.empty?
             end
 
-            servers = extract_servers(provider, p, env, body, user, settings.mongo)
+            servers = Server.extract_servers(provider, p, env, body, user, settings.mongo)
             if body.key?("trace")
               stream() do |out|
                 begin
diff --git a/devops-service/workers/worker.rb b/devops-service/workers/worker.rb
index a349539..f5d6576 100644
--- a/devops-service/workers/worker.rb
+++ b/devops-service/workers/worker.rb
@@ -17,6 +17,7 @@ class Worker
     RUNNING = "running"
     COMPLETED = "completed"
     FAILED = "failed"
+    IN_QUEUE = "queued"
   end
 
   def convert_config conf
@@ -36,6 +37,13 @@ class Worker
     Sidekiq.redis {|con| con.hset "devops", id, status}
   end
 
+  # it is called from creating server handler. But maybe we can somehow refactore code
+  # to get rid of duplication?
+  # TODO: check it
+  def self.set_status id, status
+    Sidekiq.redis {|con| con.hset "devops", id, status}
+  end
+
   def call conf, e_provider, dir
     FileUtils.mkdir_p(dir) unless File.exists?(dir)
     set_status jid, "init"