Added options to select which variables to store