Added support for saving gps location