Add desktop client support