Add and remove annotations less often