Enhance attributes management refs  #511
Enhance attributes management refs  #511