Make the Command type more safe to reduce error checking