Reworked configuration to work on Heroku