Added checks for new team entry