Few changes for EJB injection.