Refeactoring + Router patches