Add persistence support