Changed annotations to not use breakpoint orientation