redesign BundleSystem