diff --git a/YACOSCore/ejbModule/org/yacos/core/evaluation/EvaluationManager.java b/YACOSCore/ejbModule/org/yacos/core/evaluation/EvaluationManagerBean.java
similarity index 68%
rename from YACOSCore/ejbModule/org/yacos/core/evaluation/EvaluationManager.java
rename to YACOSCore/ejbModule/org/yacos/core/evaluation/EvaluationManagerBean.java
index 75c0e7d..c59ac68 100644
--- a/YACOSCore/ejbModule/org/yacos/core/evaluation/EvaluationManager.java
+++ b/YACOSCore/ejbModule/org/yacos/core/evaluation/EvaluationManagerBean.java
@@ -19,9 +19,10 @@ import org.yacos.core.conferences.ConferenceManagerBean;
  *
  */
 @Stateless
-public class EvaluationManager implements IEvaluationManager {
+public class EvaluationManagerBean implements IEvaluationManager {
 	@PersistenceContext
 	EntityManager em;
+	private ConferenceManagerBean cm = new ConferenceManagerBean();
 
 	public List<Criterion> getCriterions(int confId){
 		ConferenceManagerBean cm = new ConferenceManagerBean();
@@ -37,12 +38,21 @@ public class EvaluationManager implements IEvaluationManager {
 
 	public Criterion addCriterion(String name, Integer min_rating,
 			Integer max_rating, int confId) {
-		// TODO Auto-generated method stub
-		return null;
+		Criterion crit = new Criterion();
+		crit.setName(name);
+		crit.setMin(min_rating);
+		crit.setMax(max_rating);
+		crit.setConference(cm.getConference(confId));
+		em.persist(crit);
+		em.flush();
+		return crit;
 	}
 
 	public void updateCriterion(Criterion criterion) {
-		// TODO Auto-generated method stub
-		
+		// TODO Auto-generated method stub		
+	}
+
+	public Criterion getCriterion(int criterionId) {
+		return em.find(Criterion.class, criterionId);
 	}
 }
diff --git a/YACOSCore/ejbModule/org/yacos/core/evaluation/IEvaluationManager.java b/YACOSCore/ejbModule/org/yacos/core/evaluation/IEvaluationManager.java
index 0daea06..816bcb3 100644
--- a/YACOSCore/ejbModule/org/yacos/core/evaluation/IEvaluationManager.java
+++ b/YACOSCore/ejbModule/org/yacos/core/evaluation/IEvaluationManager.java
@@ -8,7 +8,6 @@ import java.util.List;
 import javax.ejb.Remote;
 
 import org.yacos.core.article.Article;
-import org.yacos.core.conferences.Conference;
 
 /**
  * @author christiancorsano
@@ -19,6 +18,7 @@ public interface IEvaluationManager {
 	
 	public Criterion addCriterion(String name, Integer min_rating,
 			Integer max_rating, int confId);
+	public Criterion getCriterion(int criterionId);
 	public void updateCriterion(Criterion criterion);
 	
 	public List<Report> getReportsForArticle(Article article);