Refactored AttributeValue class a bit