add internal variables support