Add support for persisting storage