Updated annotation behavior