Added  more methods to CalendarService