Pass additional field information from editable_metadata_fields, remove system_metadata_fields variable.