Refactor User Api