added variables support