More changes to match client updates