Added variables support.