Added gps extraction