Improve Routing and Module