More parameter types and variant icon enum