Added support for heroku and AWS S3