Adds smarter route creation