Refactor user methods