Adding evaluation queries