Adding some router changes for segment 2 methods