More changes needed to change CBOR tags