Update for new JSF client