Added services and EJB