Updated route mapping