towards multiple client support