Update for heroku compatibility