Update to make latest EJB client work