CommandRunner refactor