Added support for the location tracking