Shouldn't this be in atlas-persistence?