Refactored attributeHolder