Prepare to factor out kafka stuff