Make callSample.variantSetId an array, fix todos