Refactoring of storage plugins.