Improve debugger