Added additional object persistence support