Refactored user list