Enhance Attributes