Update for Heroku support