Updated routing functionality