Added custom attributes for Calendars
More stuff