Changes related to production.rb