Updated the Calendar class