Modified routes

Change-Id: I113203abe964484b7a21b0ba3ae841c1a55dc52e