Added enveloped mixin