Added suport for return_value token