Added calendar2 support