Edits to combine bootstrap and stream consumer