Add client support