Base: Move storage definition to start of script