Update with new field types