Added EJBs and DTOs