Worked on refactoring teams model