Adding Envelope classes (untested)