no longer has separate collections for the different variant types