Could we work this into using the CommandExecutor type? The regular command controller already uses it