Implement changes for Heroku deployment