add envelope support