Refactored attributes into property on object