EnvelopeMixin enhancement