Added map, location tracking