[step-2] Updates to router