Fixed ordering of storage vars