Updated the debugger and router