Delegaters were refactored