Added basic subcategory support