Updated to reflect client changes