BundleGenerator as service && some fixes