Change view interception, now managed as annotation