Make app Heroku friendly