Added Location tracking support