Exit on GenEvent call, move stream to its own module
Remove bug where access/update was incorrectly filling values with maps