Attribute refactored