Update protocol to use plaintext and decorators