More changes for HBase