Refactored AngelUser class