IDEX-1110: update according to api changes