Fixed support for multiple clients