More improvements for team management