Added token reuse in client + export_gpx method