Sanitised for Heroku
Added User model