refactoring of the bundle to prepare future enhancements