Added new specialized maps, need to factor out shared code.