Add Evaluate class