Breakpoints improvements