Added persistance management and test.