List re-factor to support calendars