Make AttributeStorage a nested struct