Uncouple clientData class