refactoring of bundle config