Added lib to support collapsible bundles