Continuing work on multiple client support