Made some minor improvements, added the OCLEvaluatorHolder interface.