Continued work on breakpoint integration