Preparation for Heroku