Moving to multiple client support