Refactored to use UserHydrator class