Added support for persistance