Added automatic storage saving.