Add support for repeated runs