refactored annotation value treatment