Updates for calendar and api