Add dataset handling; tests