Added code for public teams