Checkpoint: right before datastore refactor