Added custom name and store calendar events by ID instead of name