Add TeamInfo module
Conflicts resolved