SingleValue changes for stencils