Uncouple clientData class from dependencies