More changes for simple.data