Compatible change for modification to spi IQueryMetadataInterface