Fix swap data

Add unique identifier for each dataset.