Added ids to evaulation criteria