updated routing mapper