minor changes in design. (Specificall - decided to keep singlton in ClientData)