Implementing more conditional annotation logic.