Updated routing extension with all changes