Modified categoryType and categoryGroup (ref)