Router improvements