Update map to better support red line map (Second Pass)