(One)CommandExecutor refactored