Modified files with the router implementation