Refactor user service interface