Added calendar support