Added more support for heroku