Fix strategies definitions
Change the use of scope watch with observe