Updated with kafka 0.8.0