(Edit by Patrick) Fixed Team class methods