Improve the support for Map[,]