Add support for decoding