Added some calendar support