ANNOT-77 [Feature] Simplify the list elements.