Improved Calendar Context handling