Add OPTIONS support to evaluator