Add Category/Value support.