Add map class.
Merge.