Waste Stream Audit - metals and wet waste

The project is going for re-certification and was previously awarded this credit. In the new online form, there are prescribed categories. In the previous audit summary, separated scrap metal and aluminum cans were separated. Also, food waste and toilet waste were declared separately. My queries: 1) Should we include both scrap metal and aluminum cans in one category under "metals" or should we retain the separate classification? 2) Should we include both food waste and toilet waste, and possible additions (oil) in one category under "wet waste" or should we retain the separate classification? Hoping for your assistance. Thank you and regards, Pabs