Variant implementation enhancement