teams and participants loaders refactoring