[Core] - Routing fixes