Auto team/identifiers improvements.