Improve Attribtue system