Improved persistence and removed obsolete classes.