store RecordId instead of Tuple for swapping