Make it heroku friendly