Refactored annotation logic into an annotation-handler