Small changes for benchmarking