Added proper calendar handling based on ID's