added plaintext
added types