Added wrap handling
Updated bundles