Converted to use new command API