Update router and co.following last API change (acc. to Yehuda)