Refactor capture breakpoint