Improve the command runner