Much better support of Variables.