Refactoring of UserInfo