Goncalo/improvements/new route name