Refined calendar data a bit more