Change route public interface. Closes #2231