Add support for Kafka and HBase