Added support for gps option