Make value_arrays populate better