Ready for Heroku integration