[TASK] Change annotation scopes to reflect behavior