Added track by  for stopping duplication