DSVC-113. Change input values to support groups