Refactored. Attributes