Multiple clients functionality added