I think that oldmode is not descriptive of what's happening. Should be replaced with objectStoreBased or something like taht