[Fixing classes involving dataStore and dataAccess, after GEOT-2333 fix]