Initial support for benchmarking