Added team class and module class