Extensible Calendar framework with some enhancements