T4: Changed variables to be stored on disk