Added stuff for heroku usage