Added serialization structures for envelopes