Added variable's handling