Imporve evaluator API
Put ref in local value table instead of global one