Changed autoloading for heroku