Adding in support for persistence.