Update to add variant support