Added Partial Code for GPS support