Updated client handling
Add AllClients wrapper