added support for enabling and disbaled bundling