Added ability for v2 to handle multiples of a single value.