Added CalendarHandler component