Should be in atlas-persistence?