Fully enabled support to add custom team names