Updated Code for MockClient