Fix router and add Stream creation