Optimize for heroku deployment