Artifacts of SPI Discovery API #22