Refactor add new user