- refactored annotation adding