Added features for heroku support