Add support for multiple clients
fixes