Refactored annotation loading.