Added subcategory support.