CLI needs to support the simpler 3 arg syntax