Fix small bug
Introduce source_mapping
Continuing implementation
Continue implementation of new TransformerDataset constructor