More changes for Calendar