Modified elementData id assignement on client