BundleDAO refactored