Refactored route registering to allow multiple routes in the same module
Added missing streams