Added bundle-output support for comparator