Updated EzStorage class