Add some logic to add and remove clients