Refactoring : split sync/async datastore methods in 2 classes