Adding persisntence support.