Improve for Heroku