Fixed: Map map generic types