Use only one field for changes; implement writing of annotations
Remove test annotations