Added more support for the calendar