Major overhaul to support mapping data