improved DataStore
removed unnecessary class alias