Refactored runners, strategies