Updating Event class to have CalendarId field.