Add better Breakpoints