Issue #488 Implementation of Teams