Replacing the Datastore class