Added categories
Removed map for time being