Further refinements to the new datastores.