User list updates and refactoring