Convert commands to use new interface