Agenda : Starting refactoring delegate