Added team management