359.10 XIO refactoring for SPI