Add category tree support