Add self evaluation