[ALOY-362] implement new API