Added evaluation framework