Refactor to using .user