FSP Raw Material Hazard Analysis - Category grouping

Hello, I am in the process of bridging my facilities HACCP plan and FSP into one combined plan. I work for a beverage company (we are not RTE) which sources NUMEROUS herbs, spices & botanicals as raw materials. Our current HACCP plan utilizes a category grouping system for the raw material hazard analysis - for example we have a category for flowers/petal parts in which several individual raw materials would fall under the flower/petal category, all with similar hazards associated under this category. If a unique raw material does not fit into an existing category, or has unique hazards associated with the raw material it is called out by itself on the hazard analysis.  My question is - does a FSP require that I list all individual raw materials out or is the category grouping sufficient enough? 

All raw materials need to be listed. A category isn't sufficient.