Added location tracking