Fix abstract class DataStore