Changes to make it deployable on Heroku