[JBTM-1699] Simplify interface