Do not dump Storage service into global namespace