Added support for new short route handling.