Refactored attributes builder