More datastore refactoring.