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