Added support for benchmark