Added final support for HBase