Agenda refactoring