Update router for CAW syntax requirements