Adding evaluation capability