Support routed views part 2.
Refactor