Exchange decorator routing improvements