IDEX-1530: added attributes support
IDEX-1530: added attributes support