Optimize for heroku