Added fix for saving of Instance.extra fields.