Improve configuration for benchmarking