More updates to the router