Implemented more team classes