[JBTM-1699] Streamline interfaces and implementation