added seperate namespace for bundles