Refactored attributes.