Maps and categories merged