Enhanced Variant Selector