Teambuilder optimizations