[Core] - Added routing in