Added client support