Adding support for persistent storage