Adding more functionality to data store.