Factored out data store into its own class. Exploring versioning of entities.