Updates to calendar handling