Changes for making Data view work better with ILazyDataset