Annotation change issue fixed. TODO: Export annotation list