Added Calendar functionality