Added support for benchmark and autorun instances