New refactor in CalendarGen