Added router matches and configuration