Added support for multiple clients