Added mutli client support