Delegates refactoring