Router decoupling
Doc update