Support of subcategories  #29