IDEX-706, IDEX-811: change instatiating method for some classes