Update to new breakpoint & counter spec