More updates to the envelope class