Handle new variant types; Avoid re-annotation