cleaned up AttributeService