Preliminary changes for nondeterministic routing