Added team reuse logic