- refactored datastore service (avoid thread conflicts)