Adopting to new annotation API.