SRS-354: adding support for persistent database