Remove silly dependency on route and add better URL