Refactoring on agenda module