Map class improvements.