Added team registry (needs testing)