Adding support for router scopes