CGE2: Some rework in Map.