Changes for csr_router