Update to new EJB lookup and dependency