Changes to allow extending CalendarAdapter by clients