Add CBOR support