Added support for multiple runs