Use the same approach in WAB bundles