Separate general Mix weaving from encapsulation