Fix swap data

Add unique identifier for each dataset.
init it there directly no ?