Add wraper around client and word finder