External runners refactoring