Update calendar implemntation