Better handle persistence.