Multi-client functionality added