Add support for plaintext