[READY] Annotation insertion/removal options support