Updated envelopes with attributes