Added persistent storage