Updated to use maps from Pilot