VE-1276: Adjust to new experiment requirements