Replace custom breakpoint code with common function
Replace custom breakpoint code with common function