Refactoring of Bundle factory