Refactor model User