SPI and TLV changes