Additional client changes