Added modifications for Heroku deployment