Refactored HUD types