Added preformatted tags to the storages