Added multi-client capability