need to move all metadata to fields array