Attribute refactor