Bring up to latest Router idioms