Modify for Heroku migration