Envelope class added