Start of Refactoring of the Calendar Manager