So I actually think point 2 could also be done with a custom dataset, essentially inherit from PartiotionedDataSet and do the logic you describe in there too