Added northing and easting for waypoints