IDEX-1667: update according to API changes