fix bug in Routing.ds & enhance Conneciton.ds