Added gpx support