diff --git a/YACOSCore/ejbModule/org/yacos/core/conferences/Conference.java b/YACOSCore/ejbModule/org/yacos/core/conferences/Conference.java
index e99e729..9fc5fda 100644
--- a/YACOSCore/ejbModule/org/yacos/core/conferences/Conference.java
+++ b/YACOSCore/ejbModule/org/yacos/core/conferences/Conference.java
@@ -13,7 +13,9 @@ import javax.persistence.OneToMany;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
+
 import org.yacos.core.article.Article;
+import org.yacos.core.evaluation.Criterion;
 import org.yacos.core.users.Role;
 
 
@@ -51,7 +53,11 @@ public class Conference implements Serializable{
 */	
 	@OneToMany(targetEntity=Article.class,mappedBy="conference")
 	private List<Article> articles;
-/*
+	
+	@OneToMany(targetEntity=Criterion.class,mappedBy="conference")
+	private List<Criterion> criterions;
+	
+	/*
 	/**
 	 * @return the chairman
 	 */
@@ -158,6 +164,9 @@ public class Conference implements Serializable{
 		this.dateEnd = dateEnd;
 	}
 
+	/*
+	 * articles
+	 */
 	@OneToMany(targetEntity=Article.class,mappedBy="conference")
 	public void setArticles(List<Article> articles) {
 		this.articles = articles;
@@ -168,6 +177,9 @@ public class Conference implements Serializable{
 		return articles;
 	}
 
+	/*
+	 * roles
+	 */
 	@OneToMany(targetEntity=Role.class,mappedBy="conference")
 	public List<Role> getRoles() {
 		return roles;
@@ -177,4 +189,18 @@ public class Conference implements Serializable{
 	public void setRoles(List<Role> roles) {
 		this.roles = roles;
 	}
+
+	/*
+	 * criterions
+	 */
+	@OneToMany(targetEntity=Criterion.class,mappedBy="conference")
+	public List<Criterion> getCriterions() {
+		return criterions;
+	}
+
+	@OneToMany(targetEntity=Criterion.class,mappedBy="conference")
+	public void setCriterions(List<Criterion> criterions) {
+		this.criterions = criterions;
+	}
+
 }
diff --git a/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java b/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java
index 208408b..35bd956 100644
--- a/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java
+++ b/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java
@@ -55,7 +55,7 @@ public class ConferenceManagerBean implements IConferenceManager {
 		return list;
 	}
 	
-	
+			
 	/* 
 	 * 
 	 * méthodes relatives aux roles
diff --git a/YACOSCore/ejbModule/org/yacos/core/evaluation/Criterion.java b/YACOSCore/ejbModule/org/yacos/core/evaluation/Criterion.java
index 794a755..64caeed 100644
--- a/YACOSCore/ejbModule/org/yacos/core/evaluation/Criterion.java
+++ b/YACOSCore/ejbModule/org/yacos/core/evaluation/Criterion.java
@@ -29,8 +29,6 @@ public class Criterion {
 	@JoinColumn(name="conference_id",nullable=false)
 	private Conference conference;
 	
-	
-	
 	public Criterion( String name, Integer min_rating,
 			Integer max_rating, Conference conference) {
 		super();
diff --git a/YACOSCore/ejbModule/org/yacos/core/evaluation/EvaluationManager.java b/YACOSCore/ejbModule/org/yacos/core/evaluation/EvaluationManager.java
index b10f5d8..75c0e7d 100644
--- a/YACOSCore/ejbModule/org/yacos/core/evaluation/EvaluationManager.java
+++ b/YACOSCore/ejbModule/org/yacos/core/evaluation/EvaluationManager.java
@@ -4,12 +4,15 @@
 package org.yacos.core.evaluation;
 
 import java.util.List;
+
 import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 
 import org.yacos.core.article.Article;
+import org.yacos.core.conferences.Conference;
+import org.yacos.core.conferences.ConferenceManagerBean;
 
 /**
  * @author christiancorsano
@@ -19,10 +22,27 @@ import org.yacos.core.article.Article;
 public class EvaluationManager implements IEvaluationManager {
 	@PersistenceContext
 	EntityManager em;
+
+	public List<Criterion> getCriterions(int confId){
+		ConferenceManagerBean cm = new ConferenceManagerBean();
+		Conference conf = cm.getConference(confId);
+		return conf.getCriterions();
+	}
 	
 	@SuppressWarnings("unchecked")
 	public List<Report> getReportsForArticle(Article article) {
 		Query q = em.createNativeQuery("from Report where article_id="+article.getId(), Report.class);
 		return q.getResultList();
 	}
+
+	public Criterion addCriterion(String name, Integer min_rating,
+			Integer max_rating, int confId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public void updateCriterion(Criterion criterion) {
+		// TODO Auto-generated method stub
+		
+	}
 }
diff --git a/YACOSCore/ejbModule/org/yacos/core/evaluation/IEvaluationManager.java b/YACOSCore/ejbModule/org/yacos/core/evaluation/IEvaluationManager.java
index 0292ef8..0daea06 100644
--- a/YACOSCore/ejbModule/org/yacos/core/evaluation/IEvaluationManager.java
+++ b/YACOSCore/ejbModule/org/yacos/core/evaluation/IEvaluationManager.java
@@ -8,6 +8,7 @@ import java.util.List;
 import javax.ejb.Remote;
 
 import org.yacos.core.article.Article;
+import org.yacos.core.conferences.Conference;
 
 /**
  * @author christiancorsano
@@ -15,5 +16,11 @@ import org.yacos.core.article.Article;
  */
 @Remote
 public interface IEvaluationManager {
+	
+	public Criterion addCriterion(String name, Integer min_rating,
+			Integer max_rating, int confId);
+	public void updateCriterion(Criterion criterion);
+	
 	public List<Report> getReportsForArticle(Article article);
+	public List<Criterion> getCriterions(int confId);
 }