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