Added Integration with Calendar Class