Update variant usage to latest API