Map category

Add map in category. This pull requires needs "factoring" modification.