Updates to Router