Fix storage interface