Updaed for FieldMetadata changes in protobuf definition