Work on dynamic router