Added client and client factory stubs