Enhanced support for creating envelopes on the top of Database