Add self evaluation (Complementary Commit)