Make it Heroku compatible