Refactoring of annotation save and update.