Refactored delegates