Re-structuring storage init.