[WIP] Annotation insertion/removal options support