Adding Datastore persistence.