Fixing Data model for calendar things