Feature/batched values