@samueltardieu
Do you agree that this can first be implemented this way and later be changed?
I could move the two calls to a method in DataStore class to have it at one location.