Reworked annotation model.