Made the P2P plaintext format optional