Adding better support for heroku