Refactoring teams loading