Reformat with command_metadata and keeps commands in object