Added catetories for last few types, based on input from Raymon after EC/TC meeting

Follow up for commit 957fecfdab37faa2ad2879ca969572f8c8d2dbae