Added abstraction layer to location tracker