Updates for Heroku