Update Debugger to support arguments