UserVariables refactored