[JBTM-1699-spi] Rework split between the client and the SPI