Added sub-types and sub-categories to JSON