Integrate new calendar api, such that the calendar behaves exactly like the calendar before the changes.