Refactored annotation base.