Changed Routing to Allow for Aliases