Rewrote the storage for the plugin