Added envelope+instrument packing