Updated for 5.3.0.16983 client