Add pillar and refactored runner.