Moved storage fetching to before everything else