Tag: improve storage methods