Added EJB and CDI support