Add support for envelopes