Revamp the HBase client