Routing 3.1 additions