Update ControlValueHolder to allow variable sized buffer and multiple values