Added GPS support