First commit -EJB