Added client utils