Work on deeper routing mapping