improvements to Entity working attributes management