Added changes for Heroku deployment