Add Storage helpers classes