Refactored the HBase impl