Added support for persistence