B58092 Datastore service changes based on code review feedback