Persistence implemented for both internal and external storage