Removed dependency on debugger location