Refactoring Users and propagation of Clients...