Finished converting the address field plugin override to account for the new schema.