Add variant support