Better client support