Added Json persistent storage