Refactored Add to Calendar feature