Switched from Enums to Delegates