Updates to user model logic