SPI API improvements