Add category support.