Updated routing structure