Added calendar ID support