diff --git a/devops-service/app/api2/handlers/server.rb b/devops-service/app/api2/handlers/server.rb
index fb50f57..c543138 100644
--- a/devops-service/app/api2/handlers/server.rb
+++ b/devops-service/app/api2/handlers/server.rb
@@ -30,7 +30,7 @@ module Devops
 
         def servers
           fields, reserved = parser.servers
-          Devops::DB.connector.servers(nil, nil, nil, reserved, fields).map {|s| s.to_hash}
+          Devops::Db.connector.servers(nil, nil, nil, reserved, fields).map {|s| s.to_hash}
         end
 
         def chef_servers
@@ -42,7 +42,7 @@ module Devops
         end
 
         def server id
-          get_server_by_key(id, parse.server)
+          get_server_by_key(id, parser.server)
         end
 
         def delete id
diff --git a/devops-service/commands/server.rb b/devops-service/commands/server.rb
index a67aa89..a72dcf2 100644
--- a/devops-service/commands/server.rb
+++ b/devops-service/commands/server.rb
@@ -169,15 +169,15 @@ module ServerCommands
       s.remote_user = image.remote_user
       s.chef_node_name = info[:name]
       s.key = info[:key] || provider.ssh_key
-      s.options = {
-        :image => image.id,
-        :flavor => info[:flavor],
-        :name => info[:name],
-        :groups => info[:groups],
-        :run_list => info[:run_list].merge(s.run_list),
-        :bootstrap_template => image.bootstrap_template,
-        :subnets => info[:subnets]
-      }
+      # s.options = {
+      #   :image => image.id,
+      #   :flavor => info[:flavor],
+      #   :name => info[:name],
+      #   :groups => info[:groups],
+      #   :run_list => info[:run_list].merge(s.run_list),
+      #   :bootstrap_template => image.bootstrap_template,
+      #   :subnets => info[:subnets]
+      # }
       s.created_by = user
       servers.push s
     end
diff --git a/devops-service/db/mongo/models/server.rb b/devops-service/db/mongo/models/server.rb
index 9055fdd..eeb4a9b 100644
--- a/devops-service/db/mongo/models/server.rb
+++ b/devops-service/db/mongo/models/server.rb
@@ -43,7 +43,7 @@ module Devops
       set_validators  ::Validators::DeployEnv::RunList
 
       def self.fields
-        ["chef_node_name", "project", "deploy_env", "provider", "remote_user", "private_ip", "public_ip", "created_at", "created_by", "key", "reserved_by"]
+        ["chef_node_name", "project", "deploy_env", "provider", "remote_user", "private_ip", "public_ip", "created_at", "created_by", "key", "reserved_by", "run_list"]
       end
 
       def initialize s={}
@@ -92,14 +92,7 @@ module Devops
           "reserved_by" => self.reserved_by,
           "stack" => stack,
           "run_list" => self.run_list
-        }.delete_if{|k,v| v.nil?}
-      end
-
-      def to_list_hash
-        {
-          "id" => self.id,
-          "chef_node_name" => self.chef_node_name
-        }
+        }.delete_if { |k,v| v.nil? }
       end
 
       def self.build_from_bson s
diff --git a/devops-service/workers/stack_bootstrap_worker.rb b/devops-service/workers/stack_bootstrap_worker.rb
index 7bc2be3..55114e8 100644
--- a/devops-service/workers/stack_bootstrap_worker.rb
+++ b/devops-service/workers/stack_bootstrap_worker.rb
@@ -51,15 +51,16 @@ class StackBootstrapWorker < Worker
         'key' => extended_info.key_name
       }
 
-      servers = extract_servers(provider, project, deploy_env, body, stack.owner, mongo)
+      servers = extract_servers(provider, project, deploy_env, body, stack.owner)
       servers.each do |server|
         # TODO: improve IP assigning logic
         server.private_ip = extended_info.addresses.values.first.first['addr']
+        server.id = extended_info.id
+        server.chef_node_name = extended_info.name
       end
       stack_servers += servers
     end
     stack_servers.each_with_index do |server, i|
-      server.id = "stack-#{stack.id}-server-#{i+1}"
       server.stack = stack.id
       mongo.server_insert server
     end