Add strictness to fields in Event type