Added changes for heroku