diff --git a/YACOSCore/ejbModule/org/yacos/core/conferences/Conference.java b/YACOSCore/ejbModule/org/yacos/core/conferences/Conference.java
index 46b258c..8563079 100644
--- a/YACOSCore/ejbModule/org/yacos/core/conferences/Conference.java
+++ b/YACOSCore/ejbModule/org/yacos/core/conferences/Conference.java
@@ -17,37 +17,37 @@ import javax.persistence.TemporalType;
 import org.yacos.core.article.Article;
 import org.yacos.core.users.User;
 
-@Entity
+//@Entity
 public class Conference {
-	@Id
-	@GeneratedValue(strategy=GenerationType.AUTO)
-	private String id;
+	//@Id
+	//@GeneratedValue(strategy=GenerationType.AUTO)
+	private Integer id;
 	private String titre;
 	private String description;
 	private String otherInformations;
-	@Temporal(TemporalType.DATE)
+	//@Temporal(TemporalType.DATE)
 	private Date dateAbstract;
-	@Temporal(TemporalType.DATE)
+	//@Temporal(TemporalType.DATE)
 	private Date dateArticle;
-	@Temporal(TemporalType.DATE)
+	//@Temporal(TemporalType.DATE)
 	private Date dateEvaluation;
-	@Temporal(TemporalType.DATE)
+	//@Temporal(TemporalType.DATE)
 	private Date dateStart;
-	@Temporal(TemporalType.DATE)
+	//@Temporal(TemporalType.DATE)
 	private Date dateEnd;
 	
-	@OneToOne(targetEntity=User.class,optional=false)
-	@JoinColumn(name="chairman_id",nullable=false)
+	//@OneToOne(targetEntity=User.class,optional=false)
+	//@JoinColumn(name="chairman_id",nullable=false)
 	private User chairman;
 	
-	@OneToMany(targetEntity=Article.class,mappedBy="articles")
+	//@OneToMany(targetEntity=Article.class,mappedBy="articles")
 	private ArrayList<Article> articles;
 
 	/**
 	 * @return the chairman
 	 */
-	@OneToOne(targetEntity=User.class,optional=false)
-	@JoinColumn(name="chairman_id",nullable=false)
+	//@OneToOne(targetEntity=User.class,optional=false)
+	//@JoinColumn(name="chairman_id",nullable=false)
 	public User getChairman() {
 		return chairman;
 	}
@@ -55,50 +55,50 @@ public class Conference {
 	/**
 	 * @param chairman the chairman to set
 	 */
-	@OneToOne(targetEntity=User.class,optional=false)
-	@JoinColumn(name="chairman_id",nullable=false)
+	//@OneToOne(targetEntity=User.class,optional=false)
+	//@JoinColumn(name="chairman_id",nullable=false)
 	public void setChairman(User chairman) {
 		this.chairman = chairman;
 	}
 
-	@Temporal(TemporalType.DATE)
+	//@Temporal(TemporalType.DATE)
     public Date getDataAbstract() {
 		return dateAbstract;
 	}
 
-	@Temporal(TemporalType.DATE)
+	//@Temporal(TemporalType.DATE)
 	public void setDataAbstract(Date dataAbstract) {
 		this.dateAbstract = dataAbstract;
 	}
-	@Temporal(TemporalType.DATE)
+	//@Temporal(TemporalType.DATE)
 	public Date getDateArticle() {
 		return dateArticle;
 	}
-	@Temporal(TemporalType.DATE)
+	//@Temporal(TemporalType.DATE)
 	public void setDateArticle(Date dateArticle) {
 		this.dateArticle = dateArticle;
 	}
-	@Temporal(TemporalType.DATE)
+	//@Temporal(TemporalType.DATE)
 	public Date getDateEnd() {
 		return dateEnd;
 	}
-	@Temporal(TemporalType.DATE)
+	//@Temporal(TemporalType.DATE)
 	public void setDateEnd(Date dateEnd) {
 		this.dateEnd = dateEnd;
 	}
-	@Temporal(TemporalType.DATE)
+	//@Temporal(TemporalType.DATE)
 	public Date getDateEvaluation() {
 		return dateEvaluation;
 	}
-	@Temporal(TemporalType.DATE)
+	//@Temporal(TemporalType.DATE)
 	public void setDateEvaluation(Date dateEvaluation) {
 		this.dateEvaluation = dateEvaluation;
 	}
-	@Temporal(TemporalType.DATE)
+	//@Temporal(TemporalType.DATE)
 	public Date getDateStart() {
 		return dateStart;
 	}
-	@Temporal(TemporalType.DATE)
+	//@Temporal(TemporalType.DATE)
 	public void setDateStart(Date dateStart) {
 		this.dateStart = dateStart;
 	}
@@ -120,17 +120,17 @@ public class Conference {
 	public void setTitre(String titre) {
 		this.titre = titre;
 	}
-	public String getId() {
+	public Integer getId() {
 		return id;
 	}
-	public void setId(String id) {
+	public void setId(Integer id) {
 		this.id = id;
 	}
 	
 	public Conference() {
 	}
 	
-	public Conference(String id, String titre, String descirption, String infoComplementray, Date dataAbstract, Date dateArticle, Date dateEvaluation, Date dateStart, Date dateEnd) {
+	public Conference(Integer id, String titre, String descirption, String infoComplementray, Date dataAbstract, Date dateArticle, Date dateEvaluation, Date dateStart, Date dateEnd) {
 		super();
 		this.id = id;
 		this.titre = titre;
@@ -143,7 +143,7 @@ public class Conference {
 		this.dateEnd = dateEnd;
 	}
 
-	@OneToMany(targetEntity=Article.class,mappedBy="articles")
+	//@OneToMany(targetEntity=Article.class,mappedBy="articles")
 	public List<Article> getArticles() {
 		return articles;
 	}
diff --git a/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java b/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java
index be35b96..4bc7ec6 100644
--- a/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java
+++ b/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java
@@ -1,35 +1,45 @@
 package org.yacos.core.conferences;
 
-import javax.ejb.Stateless;
-
-import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+
+import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
 import org.yacos.core.article.Article;
-import org.yacos.core.article.ArticleManagerBean;
 
 @Stateless
 public class ConferenceManagerBean implements IConferenceManager {
 	@PersistenceContext
     EntityManager em;
 
+	private List<Conference> conferences;
+	
 	public void addConference(Conference conf) {
-		em.persist(conf);
+		//em.persist(conf);
+		conferences.add(conf);
 	}
 
 	public List<Conference> getConferences() {
-		 return em.createQuery("from Conference conf ORDER BY conf.id").getResultList();
+		 //return em.createQuery("from Conference conf ORDER BY conf.id").getResultList();
+		return conferences;
 	}
 
 	public Conference getConference(Integer id) {
-		 return em.find(Conference.class, id);
+		 //return em.find(Conference.class, id);
+		for (Conference c : conferences) {
+			if(c.getId()== id){
+				return c;
+			}
+		}
+		return null;
 	}
 
 	public void remove(Integer id) {
 		Conference conf=this.getConference(id);
-	    em.remove(conf);
+	    //em.remove(conf);
+		conferences.remove(conf);
 	}
 
 	public void update(Conference newC, Integer id) {