Add persistent storage. Github Issue #2