More router changes