Feature Addition: Support for kafka deployments