Use 'command' instead of 'shell' where possible