Adding GPS support