Added location change dispatching