Updated to include client side support for Java update 25