Refactored UserHolder