Refactored GenericAttribute handling to DomainObject