Added variables support [2/2]