New refactor for Calendars