Add support for persistent data directory