Improved storage and single-purpose plugins