Enhance Breakpoints