Improved calendar handling