add breakpoints handling