Version 1.0.2 - Added support for persistent storage