Added scoping to Router