Improve extensibility of router related command