Use the general command trait more often