Minor changes before refactor router