[JBTM-1699-spi] Improve interfaces