Architectural Extensions to support Multiple Calendars