JSF related changes