Added more debugger features