added category includes to speed up loading time and category types to map