Enhance attributes management refs  #511