Updated IClientGateway and StubClientGateway