Add variables support