Updated Time to use Calendars