Added support for persistent data type