Added persistence features.