Added breakpoints support
Ensure breakpoints are unique