Adding support for module benchmarks