Refactor user to model, rather than attribute