Added condition to prevent duplicate rosters